Rust: rename MacroStmts to MacroBlockExpr

rust/ast-generator/src/main.rs

@@ -23,6 +23,7 @@ fn class_name(type_name: &str) -> String {
         "Literal" => "LiteralExpr".to_owned(),
         "ArrayExpr" => "ArrayExprInternal".to_owned(),
         "AsmOptions" => "AsmOptionsList".to_owned(),
+        "MacroStmts" => "MacroBlockExpr".to_owned(),
         _ if type_name.starts_with("Record") => type_name.replacen("Record", "Struct", 1),
         _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
         _ => type_name.to_owned(),
@@ -36,6 +37,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("MatchExpr", "expr") => "scrutinee",
         ("Variant", "expr") => "discriminant",
         ("FieldExpr", "expr") => "container",
+        ("MacroBlockExpr", "expr") => "tail_expr",
         (_, "name_ref") => "identifier",
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",

rust/extractor/src/generated/.generated.list

@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs f7c07bc5a6ad3e1a3af05d16b5b448509f9f8403a510bfca1db42348d3c7038b f7c07bc5a6ad3e1a3af05d16b5b448509f9f8403a510bfca1db42348d3c7038b
+top.rs 47c9cc0e39e81a89bf62497e7b3e45c9cd585c425aaac7fc5d07113e8ef9861d 47c9cc0e39e81a89bf62497e7b3e45c9cd585c425aaac7fc5d07113e8ef9861d

rust/extractor/src/generated/top.rs

@@ -6307,6 +6307,69 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct MacroBlockExpr {
+    pub id: trap::TrapId<MacroBlockExpr>,
+    pub tail_expr: Option<trap::Label<Expr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+}
+
+impl trap::TrapEntry for MacroBlockExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_block_exprs", vec![id.into()]);
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("macro_block_expr_tail_exprs", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("macro_block_expr_statements", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroBlockExpr {
+    fn class_name() -> &'static str { "MacroBlockExpr" }
+}
+
+impl From<trap::Label<MacroBlockExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MacroBlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroBlockExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroBlockExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroBlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroBlockExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroBlockExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroBlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroBlockExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroBlockExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroBlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroBlockExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct MacroExpr {
     pub id: trap::TrapId<MacroExpr>,
@@ -6425,69 +6488,6 @@ impl From<trap::Label<MacroPat>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct MacroStmts {
-    pub id: trap::TrapId<MacroStmts>,
-    pub expr: Option<trap::Label<Expr>>,
-    pub statements: Vec<trap::Label<Stmt>>,
-}
-
-impl trap::TrapEntry for MacroStmts {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("macro_stmts", vec![id.into()]);
-        if let Some(v) = self.expr {
-            out.add_tuple("macro_stmts_exprs", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("macro_stmts_statements", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for MacroStmts {
-    fn class_name() -> &'static str { "MacroStmts" }
-}
-
-impl From<trap::Label<MacroStmts>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MacroStmts>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
-    fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct MacroTypeRepr {
     pub id: trap::TrapId<MacroTypeRepr>,

rust/extractor/src/translate/generated.rs

@@ -1365,16 +1365,16 @@ impl Translator<'_> {
         Some(label)
     }
 
-    pub(crate) fn emit_macro_stmts(&mut self, node: ast::MacroStmts) -> Option<Label<generated::MacroStmts>> {
+    pub(crate) fn emit_macro_stmts(&mut self, node: ast::MacroStmts) -> Option<Label<generated::MacroBlockExpr>> {
-        let expr = node.expr().and_then(|x| self.emit_expr(x));
+        let tail_expr = node.expr().and_then(|x| self.emit_expr(x));
         let statements = node.statements().filter_map(|x| self.emit_stmt(x)).collect();
-        let label = self.trap.emit(generated::MacroStmts {
+        let label = self.trap.emit(generated::MacroBlockExpr {
             id: TrapId::Star,
-            expr,
+            tail_expr,
             statements,
         });
         self.emit_location(label, &node);
-        emit_detached!(MacroStmts, self, node, label);
+        emit_detached!(MacroBlockExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }

rust/ql/.generated.list

@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 08d3062aa600c5dceba897f067b1142a382b7a342acc9f7e7548b0b9df0dab36 b9bc250dbd89e95bf8fd12eacfa725ad1b50ac644599da6100cff33adfb8a18e
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 3ec9d072adb1abd802800a104716c6896f1874fd1967cbdf55a94644d6203e71 30b03b44f858e00f3688dccaa0804306242d6fcdb077c18a94c601af32c6c703
 lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
@@ -89,13 +89,13 @@ lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3a
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
 lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
 lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
+lib/codeql/rust/elements/MacroBlockExpr.qll fb81f067a142053b122e2875a15719565024cfb09326faf12e0f1017307deb58 3ee94ef7e56bd07a8f9304869b0a7b69971b02abbee46d0bebcacb4031760282
 lib/codeql/rust/elements/MacroCall.qll a39a11d387355f59af3007dcbab3282e2b9e3289c1f8f4c6b96154ddb802f8c3 88d4575e462af2aa780219ba1338a790547fdfc1d267c4b84f1b929f4bc08d05
 lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
 lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
 lib/codeql/rust/elements/MacroItems.qll 00a5d41f7bb836d952abbd9382e42f72a9d81e65646a15a460b35ccd07a866c6 00efdb4d701b5599d76096f740da9ec157804865267b7e29bc2a214cbf03763e
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
-lib/codeql/rust/elements/MacroStmts.qll 02c4e34d266d4564ea0433a3d6186402db516dc2dd9017d7c769a76300c2286d f4517fb9fea2ea64d4f2c1998a6899d2452878000ed6f8f31c5106ef0fb6783a
 lib/codeql/rust/elements/MacroTypeRepr.qll 92fa5f6d20cce8fa3f2b4b823a8a77fdb7c11f2c2b12b8f900828c3a54eca334 51289f2622d1bb58d9a093255da2c05084a0b184f02e69e2526ec7fefdfdfd75
 lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
 lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
@@ -310,6 +310,8 @@ lib/codeql/rust/elements/internal/LiteralExprConstructor.qll 8ea3569bd50704ce7d5
 lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713fc7b07d5d2921de4a2f65a805535fb6387684c40620de 2dbc9fbc56e9de53d24265d6b13738ef5b9ced33cc3c4c1c270e04dc2fc1330f
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
 lib/codeql/rust/elements/internal/LoopingExprImpl.qll 17885c1bcf7b5a3f9c7bbad3d4d55e24372af0dedd5e7fc0efcfc0a8b2cdad70 104dc45ca399b9f6e8227ad561679f728d60170398a52b31fc90cb2a2dd3c33c
+lib/codeql/rust/elements/internal/MacroBlockExprConstructor.qll 90097c0d2c94083e997396e01cf24349af5eb1788060368dc21ae8cd8ce90d93 e067904a734356e38fbadbc4277629c5987adce6d8f7737f7458ac07e9b264af
+lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll f7a8dd1dcde2355353e17d06bb197e2d6e321ea64a39760a074d1887e68d63d6 8d429be9b6aa9f711e050b6b07f35637de22e8635a559e06dd9153a8b7947274
 lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
 lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
 lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba04412dbf32c338938acf1bc09a2f094bbdfdfe 044f43bc94fe4b6df22afae32e9f039d1d0d9e85ad9f24b6388be71211c37ce5
@@ -321,8 +323,6 @@ lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a042
 lib/codeql/rust/elements/internal/MacroPatImpl.qll 7470e2d88c38c7300a64986f058ba92bb22b4945438e2e0e268f180c4f267b71 c1507df74fc4c92887f3e0a4f857f54b61f174ffae5b1af6fb70f466175d658b
 lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
 lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
-lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
-lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 27faff9da93ad7f22a6236c73ebb4d4631161cf4ec1b82958cdf79c85aa2087c 7e2863eaf50d4b285b9240f2c5ff9497cfb4393c8528a0738d725d00f1a78406
 lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll cf8a3bdcd41dda1452200993206593e957825b406b357fc89c6286cb282347ac a82279485416567428ab7bff7b8da7a3d1233fb1cfcdb1b22932ff13bd8c8ec9
 lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll 8044498e426597c767308b0bd8894402f7b30f334c71970d7a09dae5e25dd74d c0d566147777f562055727ebfc255e81dfb87ee724782a5a0ceb02f57597c7a0
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
@@ -551,13 +551,13 @@ lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111e
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
+lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 778376cdfa4caaa9df0b9c21bda5ff0f1037b730aa43efb9fb0a08998ef3999b 6df39efe7823ce590ef6f4bdfa60957ba067205a77d94ac089b2c6a7f6b7b561
 lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce8c0e5610c54ee92ea52ebb05262338f8b612353f50 188a2d7a484bd402a521787371e64f6e00e928306c8d437e6b19bf890a7aa14e
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
 lib/codeql/rust/elements/internal/generated/MacroItems.qll 894890f61e118b3727d03ca813ae7220a15e45195f2d1d059cb1bba6802128c8 db3854b347f8782a3ec9f9a1439da822727b66f0bd33727383184ab65dbf29ac
 lib/codeql/rust/elements/internal/generated/MacroPat.qll 26bc55459a66359ad83ed7b25284a25cdbd48a868fd1bbf7e23e18b449395c43 f16ede334becba951873e585c52a3a9873c9251e3dab9a3c1a1681f632f2079f
 lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
-lib/codeql/rust/elements/internal/generated/MacroStmts.qll d19f8b925d3b926c94e3d17c71aa4500899ec3cdd22c7e3428444e7e8e70bf97 69e64fc2089d6109de012956d1e9ddd86d468bb132e9b562efc06f359b00b0e7
 lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll 4242e253fa36ee3f7d9d0677811ff5bc4ecfb02c76d768446a6a6dcd38061f68 a676632f3bb83142a0838601ae2a582d5c32d7939e4261eb8fccf3962bb06cb2
 lib/codeql/rust/elements/internal/generated/MatchArm.qll f8c4c955c50f8398159c492d9d0a74f7b71e9510fcb8a3aab1d06e0f7e15b263 713939c7ef77ca73d95788096163c26213ab49f34ed41c6f4bc09a1ef9607b0d
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
@@ -579,7 +579,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 4f168ef5d5bb87a903251cc31b2e44a759b099ec69c90af31783fbb15778c940 0e34f94a45a13396fd57d94c245dc64d1adde2ab0e22b56946f7e94c04e297fc
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 40ab5c592e7699c621787793743e33988de71ff42ca27599f5ab3ddb70e3f7d8 12c0a6eed2202ee3e892f61da3b3ce77ac3190854cdf3097e8d2be98aa3cb91d
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 27c4e9351e8dcf0290a5959b634c15398196b312e75f7ef4716e7c56090a90aa 99b4716d995792105d1a20300f8710d3ae26ca59f3a0db076114509d8bdab85e
+lib/codeql/rust/elements/internal/generated/ParentChild.qll abf6697a61edbb76320e68eda5e26ddda6ea1f514c83648183901d751619982c a253318e802b6129fff63123a050fff93a79f9075c130d393ad13995d08f38f7
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll c5fa328ea60d3a3333d7c7bb3480969c1873166c7ac8ebb9d0afad7a8099d1a8 2dbbb6200d96f7db7dea4a55bdeab8d67b14d39a43e0bd54ada019f7e466f163
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
@@ -594,7 +594,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 51d1e9e683fc79dddbff
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll 8aaa20dd4d49220f3eff2ac64f7a8d34f343d198b59785a06922c3642322e056 3d14ea25f0ad20af1bfb1b8e3e0e5fba9f1a1f764132c0d42972e08893ebd31b
+lib/codeql/rust/elements/internal/generated/Raw.qll 2fb3828c97d078d37084ce791c698bc56c81fe73e134a319089d65ec55ceb138 0234a0a5fdd741d78238dbae1ce0d841d8473b8f396fee986b6ce2b69f2abe17
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 3d8c0bd296d33b91a81633f697a43269a6538df06d277262d3990d3f6880ef57 13680f39e89bcd8299c218aba396f3deec804597e6f7cb7d4a7e7c748b6faa77
@@ -620,8 +620,8 @@ lib/codeql/rust/elements/internal/generated/StructFieldList.qll 8911a44217d091b0
 lib/codeql/rust/elements/internal/generated/StructPat.qll c76fa005c2fd0448a8803233e1e8818c4123301eb66ac5cf69d0b9eaafc61e98 6e0dffccdce24bca20e87d5ba0f0995c9a1ae8983283e71e7dbfcf6fffc67a58
 lib/codeql/rust/elements/internal/generated/StructPatField.qll 5b5c7302dbc4a902ca8e69ff31875c867e295a16a626ba3cef29cd0aa248f179 4e192a0df79947f5cb0d47fdbbba7986137a6a40a1be92ae119873e2fad67edf
 lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll e34c003e660ba059ba81bb73b3c8d21bd2a47d0251569c46277dc9ccf2947b0a 85113f35ba5f6b9e01ad4072246a4de1ac0e4528348ac564868e96f34a3e09e2
-lib/codeql/rust/elements/internal/generated/Synth.qll e35b960eeea21a70c94bd81001357fd18b1ecccef0a7b514e2a64e9091db21a2 319b9fa102d87d93d2157cd0fe7b5934d0892185e740d98b50c44cc5e99a4cd6
+lib/codeql/rust/elements/internal/generated/Synth.qll eb248f4e57985ec8eabf9ed5cfb8ba8f5ebd6ca17fb712c992811bced0e342d4 bbcbdba484d3b977a0d6b9158c5fa506f59ced2ad3ae8239d536bf826bfb7e31
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll fe007cf6eab5f0cf89ea1ea91e1f9b23e0fcf0f2872f52ef352584503f90aa29 fe007cf6eab5f0cf89ea1ea91e1f9b23e0fcf0f2872f52ef352584503f90aa29
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076 bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
@@ -658,7 +658,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll 7edf1f23fbf953a2baabcd
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 05fb894d008a9c0478d03fb1639ffc57516b67d9de7f7309331279512f630b4a 05fb894d008a9c0478d03fb1639ffc57516b67d9de7f7309331279512f630b4a
+lib/codeql/rust/elements.qll da721d51bc659921998521579df5bff6172d9079d8e243c2b65a5b9eb441b52e da721d51bc659921998521579df5bff6172d9079d8e243c2b65a5b9eb441b52e
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
@@ -894,6 +894,9 @@ test/extractor-tests/generated/LoopExpr/LoopExpr.ql 37b320acefa3734331f87414de27
 test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8
+test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 03144a5448de91801037f3c1e6d29a230e18f9c077c718e5c3801a31cf593977 9a035e3f119b0e0c88fc4c775a032220a01680fbea2cc7f8e98180205b9bb8da
+test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getStatement.ql 415a762768df2c850d21742daab5e53cd248dc3dc9652414b99737f1d5c5824b bdd2ba6c004ada34f26dac3bbc7abcd5fe250c77a97faa7fd71fb54a0dd4743a
+test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getTailExpr.ql 8f6604c09e85da1a19b0f87340cebeb1cdf4e94b208305c7393082d88cf0b032 5081d9db5b38454fad1daad2f8972661bd2fb4cce2c815a560a15f8a7b9cfcee
 test/extractor-tests/generated/MacroCall/MacroCall.ql f41552ce4c8132db854132e445aa0c8df514bfd375aa71cc9ed0ae838b7df9f1 442ecbe1481084bb072c6f8cf0eb595b7ad371587e8708610a10f2cc718535f7
 test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql c22a2a29d705e85b03a6586d1eda1a2f4f99f95f7dfeb4e6908ec3188b5ad0ad 9b8d9dcc2116a123c15c520a880efab73ade20e08197c64bc3ed0c50902c4672
 test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql 3030e87de6f773d510882ee4469146f6008898e23a4a4ccabcbaa7da1a4e765e a10fe67315eda1c59d726d538ead34f35ccffc3e121eeda74c286d49a4ce4f54
@@ -922,9 +925,6 @@ test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql
 test/extractor-tests/generated/MacroRules/MacroRules_getName.ql 591606e3accae8b8fb49e1218c4867a42724ac209cf99786db0e5d7ea0bf55d5 d2936ef5aa4bbf024372516dde3de578990aafb2b8675bbbf0f72e8b54eb82a8
 test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql 7598d33c3d86f9ad8629219b90667b2b65e3a1e18c6b0887291df9455a319cab 69d90446743e78e851145683c17677497fe42ed02f61f2b2974e216dc6e05b01
 test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f470d21ebcbe6e98436334b0bf5ba819a0ae186569ba7e88c31636c6 fcbf5c54e5a904767a6f4d37d853072aa0040738e622c49c9a02dec8739d6587
-test/extractor-tests/generated/MacroStmts/MacroStmts.ql 991042263ba99acef0972697ce79132e5650b27bf53be2f975a0da1f29940fd8 64c44e65b3c5d3de5f9532b4ff7ce54b39442b37f63da8b10d789b9b52b85a9e
-test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql 5717f20376600e7bf5e471beae1a7c0084f235f0931f8b3f25d2de94ebb86f8b e4685fd9d45b078a6402c285eed3a15cc4550f6656c8bc5e7e274a88d1c7e9b3
-test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql 8958b2212776f487869c29314e7d28f5871f5c3dde62fd9d6f87fb9e94204498 6804f5d4c0c5909689bdcdd5b8ec11ca7a8c0399b47695f66d2f99e39561565a
 test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql 49c0dbf587f84023025f90d73d54f5320993f4db7dcc90e21eda53fc0b4d1f57 0a0712171db935c549a9cfddb6721c2c188c584a67be85409ffc3facf6c9a935
 test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql cae14884e549c74be4b600a264eb236993d7b8ddd86589a9116ee2ba18f181e1 1d4ae2d8ed9ce0d7635a2ae447b41a328e59e97c6df7827ee7d5cf62343e86e1
 test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d

rust/ql/.gitattributes

@@ -91,13 +91,13 @@
 /lib/codeql/rust/elements/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/LoopExpr.qll linguist-generated
 /lib/codeql/rust/elements/LoopingExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroBlockExpr.qll linguist-generated
 /lib/codeql/rust/elements/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/MacroExpr.qll linguist-generated
 /lib/codeql/rust/elements/MacroItems.qll linguist-generated
 /lib/codeql/rust/elements/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/MacroRules.qll linguist-generated
-/lib/codeql/rust/elements/MacroStmts.qll linguist-generated
 /lib/codeql/rust/elements/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/MatchArmList.qll linguist-generated
@@ -312,6 +312,8 @@
 /lib/codeql/rust/elements/internal/LiteralPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopingExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroBlockExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroCallConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroDefConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroDefImpl.qll linguist-generated
@@ -323,8 +325,6 @@
 /lib/codeql/rust/elements/internal/MacroPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroRulesConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
@@ -553,13 +553,13 @@
 /lib/codeql/rust/elements/internal/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LoopExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LoopingExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroItems.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
@@ -896,6 +896,9 @@
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql linguist-generated
+/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql linguist-generated
+/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getStatement.ql linguist-generated
+/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getTailExpr.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql linguist-generated
@@ -924,9 +927,6 @@
 /test/extractor-tests/generated/MacroRules/MacroRules_getName.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql linguist-generated
-/test/extractor-tests/generated/MacroStmts/MacroStmts.ql linguist-generated
-/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql linguist-generated
-/test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql linguist-generated
 /test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated

rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll

@@ -107,7 +107,7 @@ class FormatTemplateVariableAccessTree extends LeafTree, FormatTemplateVariableA
 class ItemTree extends LeafTree, Item {
   ItemTree() {
     not this instanceof MacroCall and
-    this = [any(StmtList s).getAStatement(), any(MacroStmts s).getAStatement()]
+    this = [any(StmtList s).getAStatement(), any(MacroBlockExpr s).getAStatement()]
   }
 }
 
@@ -146,12 +146,12 @@ class MacroCallTree extends StandardPostOrderTree, MacroCall {
   override AstNode getChildNode(int i) { i = 0 and result = this.getExpanded() }
 }
 
-class MacroStmtsTree extends StandardPostOrderTree, MacroStmts {
+class MacroBlockExprTree extends StandardPostOrderTree, MacroBlockExpr {
   override AstNode getChildNode(int i) {
     result = this.getStatement(i)
     or
     i = this.getNumberOfStatements() and
-    result = this.getExpr()
+    result = this.getTailExpr()
   }
 }
 

rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll

@@ -1766,6 +1766,58 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasLoopBody() { exists(this.getLoopBody()) }
     }
 
+    final private class ParentMacroBlockExpr extends ParentAstNode, MacroBlockExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getTailExpr()
+      }
+    }
+
+    /**
+     * A sequence of statements generated by a `MacroCall`. For example:
+     * ```rust
+     * fn main() {
+     *     println!("Hello, world!"); // This macro expands into a list of statements
+     * }
+     * ```
+     */
+    final class MacroBlockExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private MacroBlockExpr node;
+
+      MacroBlockExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MacroBlockExpr`. */
+      MacroBlockExpr getMacroBlockExpr() { result = node }
+
+      /**
+       * Gets the tail expression of this macro block expression, if it exists.
+       */
+      ExprCfgNode getTailExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getTailExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getTailExpr()` exists.
+       */
+      predicate hasTailExpr() { exists(this.getTailExpr()) }
+
+      /**
+       * Gets the `index`th statement of this macro block expression (0-based).
+       */
+      Stmt getStatement(int index) { result = node.getStatement(index) }
+
+      /**
+       * Gets any of the statements of this macro block expression.
+       */
+      Stmt getAStatement() { result = this.getStatement(_) }
+
+      /**
+       * Gets the number of statements of this macro block expression.
+       */
+      int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+    }
+
     final private class ParentMacroCall extends ParentAstNode, MacroCall {
       override predicate relevantChild(AstNode child) { none() }
     }
@@ -1900,58 +1952,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasMacroCall() { exists(this.getMacroCall()) }
     }
 
-    final private class ParentMacroStmts extends ParentAstNode, MacroStmts {
-      override predicate relevantChild(AstNode child) {
-        none()
-        or
-        child = this.getExpr()
-      }
-    }
-
-    /**
-     * A sequence of statements generated by a `MacroCall`. For example:
-     * ```rust
-     * fn main() {
-     *     println!("Hello, world!"); // This macro expands into a list of statements
-     * }
-     * ```
-     */
-    final class MacroStmtsCfgNode extends CfgNodeFinal, ExprCfgNode {
-      private MacroStmts node;
-
-      MacroStmtsCfgNode() { node = this.getAstNode() }
-
-      /** Gets the underlying `MacroStmts`. */
-      MacroStmts getMacroStmts() { result = node }
-
-      /**
-       * Gets the expression of this macro statements, if it exists.
-       */
-      ExprCfgNode getExpr() {
-        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
-      }
-
-      /**
-       * Holds if `getExpr()` exists.
-       */
-      predicate hasExpr() { exists(this.getExpr()) }
-
-      /**
-       * Gets the `index`th statement of this macro statements (0-based).
-       */
-      Stmt getStatement(int index) { result = node.getStatement(index) }
-
-      /**
-       * Gets any of the statements of this macro statements.
-       */
-      Stmt getAStatement() { result = this.getStatement(_) }
-
-      /**
-       * Gets the number of statements of this macro statements.
-       */
-      int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
-    }
-
     final private class ParentMatchExpr extends ParentAstNode, MatchExpr {
       override predicate relevantChild(AstNode child) {
         none()
@@ -3751,6 +3751,18 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
           cfgNode
         )
       or
+      pred = "getTailExpr" and
+      parent =
+        any(Nodes::MacroBlockExprCfgNode cfgNode, MacroBlockExpr astNode |
+          astNode = cfgNode.getMacroBlockExpr() and
+          child = getDesugared(astNode.getTailExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getTailExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
       pred = "getMacroCall" and
       parent =
         any(Nodes::MacroExprCfgNode cfgNode, MacroExpr astNode |
@@ -3775,18 +3787,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
           cfgNode
         )
       or
-      pred = "getExpr" and
-      parent =
-        any(Nodes::MacroStmtsCfgNode cfgNode, MacroStmts astNode |
-          astNode = cfgNode.getMacroStmts() and
-          child = getDesugared(astNode.getExpr()) and
-          i = -1 and
-          hasCfgNode(child) and
-          not child = cfgNode.getExpr().getAstNode()
-        |
-          cfgNode
-        )
-      or
       pred = "getScrutinee" and
       parent =
         any(Nodes::MatchExprCfgNode cfgNode, MatchExpr astNode |

rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll

@@ -203,7 +203,7 @@ private ExprCfgNode getALastEvalNode(ExprCfgNode e) {
   result = e.(ReturnExprCfgNode).getExpr() or
   result = e.(BreakExprCfgNode).getExpr() or
   result = e.(BlockExprCfgNode).getTailExpr() or
-  result = e.(MacroStmtsCfgNode).getExpr() or
+  result = e.(MacroBlockExprCfgNode).getTailExpr() or
   result = e.(MatchExprCfgNode).getArmExpr(_) or
   result = e.(MacroExprCfgNode).getMacroCall().(MacroCallCfgNode).getExpandedNode() or
   result.(BreakExprCfgNode).getTarget() = e

rust/ql/lib/codeql/rust/elements.qll

@@ -94,13 +94,13 @@ import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.LoopExpr
 import codeql.rust.elements.LoopingExpr
+import codeql.rust.elements.MacroBlockExpr
 import codeql.rust.elements.MacroCall
 import codeql.rust.elements.MacroDef
 import codeql.rust.elements.MacroExpr
 import codeql.rust.elements.MacroItems
 import codeql.rust.elements.MacroPat
 import codeql.rust.elements.MacroRules
-import codeql.rust.elements.MacroStmts
 import codeql.rust.elements.MacroTypeRepr
 import codeql.rust.elements.MatchArm
 import codeql.rust.elements.MatchArmList

rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll

@@ -1,9 +1,9 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `MacroStmts`.
+ * This module provides the public class `MacroBlockExpr`.
  */
 
-private import internal.MacroStmtsImpl
+private import internal.MacroBlockExprImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
@@ -15,4 +15,4 @@ import codeql.rust.elements.Stmt
  * }
  * ```
  */
-final class MacroStmts = Impl::MacroStmts;
+final class MacroBlockExpr = Impl::MacroBlockExpr;

rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprConstructor.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
- *  `MacroStmts` synthesized instances.
+ *  `MacroBlockExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `MacroStmts` synthesized instances.
+ *  The characteristic predicate of `MacroBlockExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructMacroStmts(Raw::MacroStmts id) { any() }
+predicate constructMacroBlockExpr(Raw::MacroBlockExpr id) { any() }

rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll

@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `MacroStmts`.
+ * This module provides a hand-modifiable wrapper around the generated class `MacroBlockExpr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.MacroStmts
+private import codeql.rust.elements.internal.generated.MacroBlockExpr
 
 /**
- * INTERNAL: This module contains the customizable definition of `MacroStmts` and should not
+ * INTERNAL: This module contains the customizable definition of `MacroBlockExpr` and should not
  * be referenced directly.
  */
 module Impl {
@@ -20,5 +20,5 @@ module Impl {
    * }
    * ```
    */
-  class MacroStmts extends Generated::MacroStmts { }
+  class MacroBlockExpr extends Generated::MacroBlockExpr { }
 }

rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll

@@ -0,0 +1,66 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroBlockExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroBlockExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroBlockExpr` class directly.
+   * Use the subclass `MacroBlockExpr`, where the following predicates are available.
+   */
+  class MacroBlockExpr extends Synth::TMacroBlockExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "MacroBlockExpr" }
+
+    /**
+     * Gets the tail expression of this macro block expression, if it exists.
+     */
+    Expr getTailExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroBlockExprToRaw(this)
+              .(Raw::MacroBlockExpr)
+              .getTailExpr())
+    }
+
+    /**
+     * Holds if `getTailExpr()` exists.
+     */
+    final predicate hasTailExpr() { exists(this.getTailExpr()) }
+
+    /**
+     * Gets the `index`th statement of this macro block expression (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertMacroBlockExprToRaw(this)
+              .(Raw::MacroBlockExpr)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this macro block expression.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this macro block expression.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+  }
+}

rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll

@@ -1,64 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MacroStmts`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Stmt
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MacroStmts` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A sequence of statements generated by a `MacroCall`. For example:
-   * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::MacroStmts` class directly.
-   * Use the subclass `MacroStmts`, where the following predicates are available.
-   */
-  class MacroStmts extends Synth::TMacroStmts, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "MacroStmts" }
-
-    /**
-     * Gets the expression of this macro statements, if it exists.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMacroStmtsToRaw(this).(Raw::MacroStmts).getExpr())
-    }
-
-    /**
-     * Holds if `getExpr()` exists.
-     */
-    final predicate hasExpr() { exists(this.getExpr()) }
-
-    /**
-     * Gets the `index`th statement of this macro statements (0-based).
-     */
-    Stmt getStatement(int index) {
-      result =
-        Synth::convertStmtFromRaw(Synth::convertMacroStmtsToRaw(this)
-              .(Raw::MacroStmts)
-              .getStatement(index))
-    }
-
-    /**
-     * Gets any of the statements of this macro statements.
-     */
-    final Stmt getAStatement() { result = this.getStatement(_) }
-
-    /**
-     * Gets the number of statements of this macro statements.
-     */
-    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
-  }
-}

rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll

@@ -2368,6 +2368,28 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfMacroBlockExpr(
+    MacroBlockExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nTailExpr, int nStatement |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nTailExpr = n + 1 and
+      nStatement = nTailExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
+        or
+        result = e.getStatement(index - nTailExpr) and
+        partialPredicateCall = "Statement(" + (index - nTailExpr).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfMacroExpr(MacroExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nMacroCall |
       b = 0 and
@@ -2400,26 +2422,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMacroStmts(MacroStmts e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nStatement |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
-      nStatement = nExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        result = e.getStatement(index - nExpr) and
-        partialPredicateCall = "Statement(" + (index - nExpr).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfMacroTypeRepr(
     MacroTypeRepr e, int index, string partialPredicateCall
   ) {
@@ -4298,12 +4300,12 @@ private module Impl {
     or
     result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfMacroBlockExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfMacroExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfMacroPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMacroStmts(e, index, partialAccessor)
-    or
     result = getImmediateChildOfMacroTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfMatchExpr(e, index, partialAccessor)

rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll

@@ -2346,6 +2346,29 @@ module Raw {
     LiteralExpr getLiteral() { literal_pat_literals(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A sequence of statements generated by a `MacroCall`. For example:
+   * ```rust
+   * fn main() {
+   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * }
+   * ```
+   */
+  class MacroBlockExpr extends @macro_block_expr, Expr {
+    override string toString() { result = "MacroBlockExpr" }
+
+    /**
+     * Gets the tail expression of this macro block expression, if it exists.
+     */
+    Expr getTailExpr() { macro_block_expr_tail_exprs(this, result) }
+
+    /**
+     * Gets the `index`th statement of this macro block expression (0-based).
+     */
+    Stmt getStatement(int index) { macro_block_expr_statements(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A MacroExpr. For example:
@@ -2378,29 +2401,6 @@ module Raw {
     MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A sequence of statements generated by a `MacroCall`. For example:
-   * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
-   * }
-   * ```
-   */
-  class MacroStmts extends @macro_stmts, Expr {
-    override string toString() { result = "MacroStmts" }
-
-    /**
-     * Gets the expression of this macro statements, if it exists.
-     */
-    Expr getExpr() { macro_stmts_exprs(this, result) }
-
-    /**
-     * Gets the `index`th statement of this macro statements (0-based).
-     */
-    Stmt getStatement(int index) { macro_stmts_statements(this, index, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A MacroTypeRepr. For example:

rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll

@@ -318,6 +318,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TLoopExpr(Raw::LoopExpr id) { constructLoopExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroBlockExpr(Raw::MacroBlockExpr id) { constructMacroBlockExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -342,10 +346,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TMacroRules(Raw::MacroRules id) { constructMacroRules(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TMacroStmts(Raw::MacroStmts id) { constructMacroStmts(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -742,9 +742,9 @@ module Synth {
     TArrayExpr or TArrayExprInternal or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or
         TBreakExpr or TCallExprBase or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
         TFormatArgsExpr or TIfExpr or TIndexExpr or TLabelableExpr or TLetExpr or TLiteralExpr or
-        TMacroExpr or TMacroStmts or TMatchExpr or TOffsetOfExpr or TParenExpr or TPathExprBase or
+        TMacroBlockExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or
-        TPrefixExpr or TRangeExpr or TRefExpr or TReturnExpr or TStructExpr or TTryExpr or
+        TPathExprBase or TPrefixExpr or TRangeExpr or TRefExpr or TReturnExpr or TStructExpr or
-        TTupleExpr or TUnderscoreExpr or TYeetExpr or TYieldExpr;
+        TTryExpr or TTupleExpr or TUnderscoreExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
@@ -1300,6 +1300,12 @@ module Synth {
    */
   TLoopExpr convertLoopExprFromRaw(Raw::Element e) { result = TLoopExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TMacroBlockExpr`, if possible.
+   */
+  TMacroBlockExpr convertMacroBlockExprFromRaw(Raw::Element e) { result = TMacroBlockExpr(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroCall`, if possible.
@@ -1336,12 +1342,6 @@ module Synth {
    */
   TMacroRules convertMacroRulesFromRaw(Raw::Element e) { result = TMacroRules(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMacroStmts`, if possible.
-   */
-  TMacroStmts convertMacroStmtsFromRaw(Raw::Element e) { result = TMacroStmts(e) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TMacroTypeRepr`, if possible.
@@ -2125,9 +2125,9 @@ module Synth {
     or
     result = convertLiteralExprFromRaw(e)
     or
-    result = convertMacroExprFromRaw(e)
+    result = convertMacroBlockExprFromRaw(e)
     or
-    result = convertMacroStmtsFromRaw(e)
+    result = convertMacroExprFromRaw(e)
     or
     result = convertMatchExprFromRaw(e)
     or
@@ -2900,6 +2900,12 @@ module Synth {
    */
   Raw::Element convertLoopExprToRaw(TLoopExpr e) { e = TLoopExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroBlockExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertMacroBlockExprToRaw(TMacroBlockExpr e) { e = TMacroBlockExpr(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroCall` to a raw DB element, if possible.
@@ -2936,12 +2942,6 @@ module Synth {
    */
   Raw::Element convertMacroRulesToRaw(TMacroRules e) { e = TMacroRules(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TMacroStmts` to a raw DB element, if possible.
-   */
-  Raw::Element convertMacroStmtsToRaw(TMacroStmts e) { e = TMacroStmts(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMacroTypeRepr` to a raw DB element, if possible.
@@ -3725,9 +3725,9 @@ module Synth {
     or
     result = convertLiteralExprToRaw(e)
     or
-    result = convertMacroExprToRaw(e)
+    result = convertMacroBlockExprToRaw(e)
     or
-    result = convertMacroStmtsToRaw(e)
+    result = convertMacroExprToRaw(e)
     or
     result = convertMatchExprToRaw(e)
     or

rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll

@@ -77,13 +77,13 @@ import codeql.rust.elements.internal.LifetimeParamConstructor
 import codeql.rust.elements.internal.LiteralExprConstructor
 import codeql.rust.elements.internal.LiteralPatConstructor
 import codeql.rust.elements.internal.LoopExprConstructor
+import codeql.rust.elements.internal.MacroBlockExprConstructor
 import codeql.rust.elements.internal.MacroCallConstructor
 import codeql.rust.elements.internal.MacroDefConstructor
 import codeql.rust.elements.internal.MacroExprConstructor
 import codeql.rust.elements.internal.MacroItemsConstructor
 import codeql.rust.elements.internal.MacroPatConstructor
 import codeql.rust.elements.internal.MacroRulesConstructor
-import codeql.rust.elements.internal.MacroStmtsConstructor
 import codeql.rust.elements.internal.MacroTypeReprConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
 import codeql.rust.elements.internal.MatchArmListConstructor

rust/ql/lib/rust.dbscheme

@@ -437,8 +437,8 @@ closure_binder_generic_param_lists(
 | @labelable_expr
 | @let_expr
 | @literal_expr
+| @macro_block_expr
 | @macro_expr
-| @macro_stmts
 | @match_expr
 | @offset_of_expr
 | @paren_expr
@@ -2081,6 +2081,23 @@ literal_pat_literals(
   int literal: @literal_expr ref
 );
 
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
 macro_exprs(
   unique int id: @macro_expr
 );
@@ -2101,23 +2118,6 @@ macro_pat_macro_calls(
   int macro_call: @macro_call ref
 );
 
-macro_stmts(
-  unique int id: @macro_stmts
-);
-
-#keyset[id]
-macro_stmts_exprs(
-  int id: @macro_stmts ref,
-  int expr: @expr ref
-);
-
-#keyset[id, index]
-macro_stmts_statements(
-  int id: @macro_stmts ref,
-  int index: int ref,
-  int statement: @stmt ref
-);
-
 macro_type_reprs(
   unique int id: @macro_type_repr
 );

rust/ql/test/extractor-tests/generated/.generated_tests.list

@@ -56,13 +56,13 @@ LifetimeParam/gen_lifetime_param.rs 2caed50ce48360681271e4e89fde0d6d9076ebb9cd9c
 LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d
 LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
 LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
+MacroBlockExpr/gen_macro_block_expr.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
 MacroCall/gen_macro_call.rs 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79 139ef2c69323eea1a901e260d4e2acdd00b26f013b90c9344f48c6503ce29d79
 MacroDef/gen_macro_def.rs 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5 17c5387fb464a60b4a4520d22b055ba35ff23e9fe431a18a33808ae02c4bbff5
 MacroExpr/gen_macro_expr.rs 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb 3c23dc88fcc4bc8f97d9364d2f367671a0a5a63d07e52237d28204b64756dcdb
 MacroItems/gen_macro_items.rs 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594b0200cc5b9b931
 MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
 MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
-MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
 MacroTypeRepr/gen_macro_type_repr.rs 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df
 MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
 MatchArmList/gen_match_arm_list.rs dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6 dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6

rust/ql/test/extractor-tests/generated/.gitattributes

@@ -58,13 +58,13 @@
 /LiteralExpr/gen_literal_expr.rs linguist-generated
 /LiteralPat/gen_literal_pat.rs linguist-generated
 /LoopExpr/gen_loop_expr.rs linguist-generated
+/MacroBlockExpr/gen_macro_block_expr.rs linguist-generated
 /MacroCall/gen_macro_call.rs linguist-generated
 /MacroDef/gen_macro_def.rs linguist-generated
 /MacroExpr/gen_macro_expr.rs linguist-generated
 /MacroItems/gen_macro_items.rs linguist-generated
 /MacroPat/gen_macro_pat.rs linguist-generated
 /MacroRules/gen_macro_rules.rs linguist-generated
-/MacroStmts/gen_macro_stmts.rs linguist-generated
 /MacroTypeRepr/gen_macro_type_repr.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
 /MatchArmList/gen_match_arm_list.rs linguist-generated

rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected

@@ -0,0 +1 @@
+| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | hasTailExpr: | yes | getNumberOfStatements: | 0 |

rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql

@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroBlockExpr x, string hasTailExpr, int getNumberOfStatements
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasTailExpr() then hasTailExpr = "yes" else hasTailExpr = "no") and
+  getNumberOfStatements = x.getNumberOfStatements()
+select x, "hasTailExpr:", hasTailExpr, "getNumberOfStatements:", getNumberOfStatements

rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getStatement.ql

@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroStmts x, int index
+from MacroBlockExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getStatement(index)

rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getTailExpr.expected

@@ -0,0 +1 @@
+| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | gen_macro_block_expr.rs:5:14:5:28 | { ... } |

rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr_getTailExpr.ql

@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroStmts x
+from MacroBlockExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
+select x, x.getTailExpr()

rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected

@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | todo!... | gen_macro_call.rs:5:5:5:11 | MacroStmts |
+| gen_macro_call.rs:5:5:5:11 | todo!... | gen_macro_call.rs:5:5:5:11 | MacroBlockExpr |

rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.expected

@@ -1 +0,0 @@
-| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | hasExpr: | yes | getNumberOfStatements: | 0 |

rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts.ql

@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MacroStmts x, string hasExpr, int getNumberOfStatements
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  getNumberOfStatements = x.getNumberOfStatements()
-select x, "hasExpr:", hasExpr, "getNumberOfStatements:", getNumberOfStatements

rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected

@@ -1 +0,0 @@
-| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | gen_macro_stmts.rs:5:14:5:28 | { ... } |

rust/ql/test/library-tests/controlflow/Cfg.expected

@@ -397,9 +397,9 @@ edges
 | test.rs:171:26:171:28 | ...::format_args_nl!... | test.rs:171:26:171:28 | MacroExpr |  |
 | test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:29 | ...::_print |  |
 | test.rs:171:26:171:28 | FormatArgsExpr | test.rs:171:26:171:28 | ...::format_args_nl!... |  |
+| test.rs:171:26:171:28 | MacroBlockExpr | test.rs:171:17:171:29 | println!... |  |
 | test.rs:171:26:171:28 | MacroExpr | test.rs:171:26:171:28 | ...::_print(...) |  |
-| test.rs:171:26:171:28 | MacroStmts | test.rs:171:17:171:29 | println!... |  |
+| test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | MacroBlockExpr |  |
-| test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | MacroStmts |  |
 | test.rs:172:20:174:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} |  |
 | test.rs:173:17:173:29 | ...::_print | test.rs:173:26:173:28 | "2\\n" |  |
 | test.rs:173:17:173:29 | MacroExpr | test.rs:172:20:174:13 | { ... } |  |
@@ -410,9 +410,9 @@ edges
 | test.rs:173:26:173:28 | ...::format_args_nl!... | test.rs:173:26:173:28 | MacroExpr |  |
 | test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:29 | ...::_print |  |
 | test.rs:173:26:173:28 | FormatArgsExpr | test.rs:173:26:173:28 | ...::format_args_nl!... |  |
+| test.rs:173:26:173:28 | MacroBlockExpr | test.rs:173:17:173:29 | println!... |  |
 | test.rs:173:26:173:28 | MacroExpr | test.rs:173:26:173:28 | ...::_print(...) |  |
-| test.rs:173:26:173:28 | MacroStmts | test.rs:173:17:173:29 | println!... |  |
+| test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | MacroBlockExpr |  |
-| test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | MacroStmts |  |
 | test.rs:175:13:175:25 | ...::_print | test.rs:175:22:175:24 | "3\\n" |  |
 | test.rs:175:13:175:25 | MacroExpr | test.rs:169:18:176:9 | { ... } |  |
 | test.rs:175:13:175:25 | println!... | test.rs:175:13:175:25 | MacroExpr |  |
@@ -422,9 +422,9 @@ edges
 | test.rs:175:22:175:24 | ...::format_args_nl!... | test.rs:175:22:175:24 | MacroExpr |  |
 | test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:25 | ...::_print |  |
 | test.rs:175:22:175:24 | FormatArgsExpr | test.rs:175:22:175:24 | ...::format_args_nl!... |  |
+| test.rs:175:22:175:24 | MacroBlockExpr | test.rs:175:13:175:25 | println!... |  |
 | test.rs:175:22:175:24 | MacroExpr | test.rs:175:22:175:24 | ...::_print(...) |  |
-| test.rs:175:22:175:24 | MacroStmts | test.rs:175:13:175:25 | println!... |  |
+| test.rs:175:22:175:24 | { ... } | test.rs:175:22:175:24 | MacroBlockExpr |  |
-| test.rs:175:22:175:24 | { ... } | test.rs:175:22:175:24 | MacroStmts |  |
 | test.rs:179:5:188:5 | enter fn test_nested_if_match | test.rs:179:29:179:29 | a |  |
 | test.rs:179:5:188:5 | exit fn test_nested_if_match (normal) | test.rs:179:5:188:5 | exit fn test_nested_if_match |  |
 | test.rs:179:29:179:29 | a | test.rs:179:29:179:29 | a |  |
@@ -902,11 +902,11 @@ edges
 | test.rs:363:39:363:53 | ...::panic_fmt(...) | test.rs:363:39:363:53 | { ... } |  |
 | test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:54 | ...::panic_fmt |  |
 | test.rs:363:39:363:53 | FormatArgsExpr | test.rs:363:39:363:53 | ...::const_format_args!... |  |
+| test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:32:363:54 | panic!... |  |
+| test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:39:363:53 | ...::panic_2021!... |  |
 | test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | ...::panic_fmt(...) |  |
-| test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | MacroStmts |  |
+| test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | MacroBlockExpr |  |
-| test.rs:363:39:363:53 | MacroStmts | test.rs:363:32:363:54 | panic!... |  |
+| test.rs:363:39:363:53 | { ... } | test.rs:363:39:363:53 | MacroBlockExpr |  |
-| test.rs:363:39:363:53 | MacroStmts | test.rs:363:39:363:53 | ...::panic_2021!... |  |
-| test.rs:363:39:363:53 | { ... } | test.rs:363:39:363:53 | MacroStmts |  |
 | test.rs:364:9:364:9 | n | test.rs:362:46:365:5 | { ... } |  |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:367:29:367:29 | m |  |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | exit fn test_let_with_return |  |
@@ -1189,9 +1189,9 @@ edges
 | test.rs:495:18:495:32 | ...::format_args_nl!... | test.rs:495:18:495:32 | MacroExpr |  |
 | test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:33 | ...::_print |  |
 | test.rs:495:18:495:32 | FormatArgsExpr | test.rs:495:18:495:32 | ...::format_args_nl!... |  |
+| test.rs:495:18:495:32 | MacroBlockExpr | test.rs:495:9:495:33 | println!... |  |
 | test.rs:495:18:495:32 | MacroExpr | test.rs:495:18:495:32 | ...::_print(...) |  |
-| test.rs:495:18:495:32 | MacroStmts | test.rs:495:9:495:33 | println!... |  |
+| test.rs:495:18:495:32 | { ... } | test.rs:495:18:495:32 | MacroBlockExpr |  |
-| test.rs:495:18:495:32 | { ... } | test.rs:495:18:495:32 | MacroStmts |  |
 | test.rs:498:5:517:5 | enter fn async_block | test.rs:498:26:498:26 | b |  |
 | test.rs:498:5:517:5 | exit fn async_block (normal) | test.rs:498:5:517:5 | exit fn async_block |  |
 | test.rs:498:26:498:26 | b | test.rs:498:26:498:26 | b |  |
@@ -1213,9 +1213,9 @@ edges
 | test.rs:500:22:500:40 | ...::format_args_nl!... | test.rs:500:22:500:40 | MacroExpr |  |
 | test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:41 | ...::_print |  |
 | test.rs:500:22:500:40 | FormatArgsExpr | test.rs:500:22:500:40 | ...::format_args_nl!... |  |
+| test.rs:500:22:500:40 | MacroBlockExpr | test.rs:500:13:500:41 | println!... |  |
 | test.rs:500:22:500:40 | MacroExpr | test.rs:500:22:500:40 | ...::_print(...) |  |
-| test.rs:500:22:500:40 | MacroStmts | test.rs:500:13:500:41 | println!... |  |
+| test.rs:500:22:500:40 | { ... } | test.rs:500:22:500:40 | MacroBlockExpr |  |
-| test.rs:500:22:500:40 | { ... } | test.rs:500:22:500:40 | MacroStmts |  |
 | test.rs:502:9:504:10 | let ... = ... | test.rs:502:31:504:9 | { ... } |  |
 | test.rs:502:13:502:27 | say_how_are_you | test.rs:502:13:502:27 | say_how_are_you |  |
 | test.rs:502:13:502:27 | say_how_are_you | test.rs:505:9:505:28 | let ... = ... | match |
@@ -1231,9 +1231,9 @@ edges
 | test.rs:503:22:503:35 | ...::format_args_nl!... | test.rs:503:22:503:35 | MacroExpr |  |
 | test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:36 | ...::_print |  |
 | test.rs:503:22:503:35 | FormatArgsExpr | test.rs:503:22:503:35 | ...::format_args_nl!... |  |
+| test.rs:503:22:503:35 | MacroBlockExpr | test.rs:503:13:503:36 | println!... |  |
 | test.rs:503:22:503:35 | MacroExpr | test.rs:503:22:503:35 | ...::_print(...) |  |
-| test.rs:503:22:503:35 | MacroStmts | test.rs:503:13:503:36 | println!... |  |
+| test.rs:503:22:503:35 | { ... } | test.rs:503:22:503:35 | MacroBlockExpr |  |
-| test.rs:503:22:503:35 | { ... } | test.rs:503:22:503:35 | MacroStmts |  |
 | test.rs:505:9:505:28 | let ... = ... | test.rs:505:20:505:27 | { ... } |  |
 | test.rs:505:13:505:16 | noop | test.rs:505:13:505:16 | noop |  |
 | test.rs:505:13:505:16 | noop | test.rs:506:9:506:26 | ExprStmt | match |
@@ -1292,16 +1292,16 @@ edges
 | test.rs:533:13:533:49 | ...::panic_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
 | test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | fn panic_cold_explicit |  |
 | test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | panic_cold_explicit |  |
+| test.rs:533:13:533:49 | MacroBlockExpr | test.rs:533:13:533:49 | ...::panic_2021!... |  |
 | test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } |  |
 | test.rs:533:13:533:49 | MacroExpr | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | MacroStmts | test.rs:533:13:533:49 | ...::panic_2021!... |  |
 | test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr |  |
 | test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | ...::panic_explicit |  |
 | test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:49 | exit fn panic_cold_explicit |  |
 | test.rs:533:13:533:49 | fn panic_cold_explicit | test.rs:533:13:533:49 | ExprStmt |  |
 | test.rs:533:13:533:49 | panic_cold_explicit | test.rs:533:13:533:49 | panic_cold_explicit(...) |  |
 | test.rs:533:13:533:49 | panic_cold_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | MacroStmts |  |
+| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | MacroBlockExpr |  |
 | test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) |  |
 | test.rs:533:13:533:49 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:50 | ExprStmt | test.rs:533:21:533:42 | ...::size_of::<...> |  |
@@ -1309,11 +1309,11 @@ edges
 | test.rs:533:21:533:44 | ...::size_of::<...>(...) | test.rs:533:48:533:48 | 0 |  |
 | test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
 | test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
-| test.rs:533:21:533:48 | MacroStmts | test.rs:533:13:533:49 | assert!... |  |
+| test.rs:533:21:533:48 | MacroBlockExpr | test.rs:533:13:533:49 | assert!... |  |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | { ... } |  |
-| test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | MacroStmts |  |
+| test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | MacroBlockExpr |  |
 | test.rs:533:48:533:48 | 0 | test.rs:533:21:533:48 | ... > ... |  |
 | test.rs:536:9:536:10 | 42 | test.rs:529:41:537:5 | { ... } |  |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:540:9:540:30 | Const |  |

rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

@@ -10,17 +10,17 @@ localStep
 | main.rs:6:9:6:9 | s | main.rs:6:9:6:9 | s |
 | main.rs:6:9:6:14 | ...: i64 | main.rs:6:9:6:9 | s |
 | main.rs:7:14:7:20 | FormatArgsExpr | main.rs:7:14:7:20 | MacroExpr |
-| main.rs:7:14:7:20 | MacroStmts | main.rs:7:5:7:21 | MacroExpr |
+| main.rs:7:14:7:20 | MacroBlockExpr | main.rs:7:5:7:21 | MacroExpr |
 | main.rs:7:14:7:20 | [post] MacroExpr | main.rs:7:14:7:20 | [post] FormatArgsExpr |
-| main.rs:7:14:7:20 | { ... } | main.rs:7:14:7:20 | MacroStmts |
+| main.rs:7:14:7:20 | { ... } | main.rs:7:14:7:20 | MacroBlockExpr |
 | main.rs:10:13:10:14 | [SSA] sr | main.rs:11:20:11:21 | sr |
 | main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | [SSA] sr |
 | main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | sr |
 | main.rs:10:13:10:20 | ...: ... | main.rs:10:13:10:14 | sr |
 | main.rs:11:14:11:21 | FormatArgsExpr | main.rs:11:14:11:21 | MacroExpr |
-| main.rs:11:14:11:21 | MacroStmts | main.rs:11:5:11:22 | MacroExpr |
+| main.rs:11:14:11:21 | MacroBlockExpr | main.rs:11:5:11:22 | MacroExpr |
 | main.rs:11:14:11:21 | [post] MacroExpr | main.rs:11:14:11:21 | [post] FormatArgsExpr |
-| main.rs:11:14:11:21 | { ... } | main.rs:11:14:11:21 | MacroStmts |
+| main.rs:11:14:11:21 | { ... } | main.rs:11:14:11:21 | MacroBlockExpr |
 | main.rs:22:9:22:9 | [SSA] s | main.rs:23:10:23:10 | s |
 | main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | [SSA] s |
 | main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | s |
@@ -684,9 +684,9 @@ localStep
 | main.rs:462:16:462:16 | s | main.rs:462:16:462:16 | s |
 | main.rs:462:16:462:24 | ...: String | main.rs:462:16:462:16 | s |
 | main.rs:463:14:463:20 | FormatArgsExpr | main.rs:463:14:463:20 | MacroExpr |
-| main.rs:463:14:463:20 | MacroStmts | main.rs:463:5:463:21 | MacroExpr |
+| main.rs:463:14:463:20 | MacroBlockExpr | main.rs:463:5:463:21 | MacroExpr |
 | main.rs:463:14:463:20 | [post] MacroExpr | main.rs:463:14:463:20 | [post] FormatArgsExpr |
-| main.rs:463:14:463:20 | { ... } | main.rs:463:14:463:20 | MacroStmts |
+| main.rs:463:14:463:20 | { ... } | main.rs:463:14:463:20 | MacroBlockExpr |
 | main.rs:467:9:467:9 | [SSA] a | main.rs:468:13:468:13 | a |
 | main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | [SSA] a |
 | main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | a |

rust/ql/test/library-tests/variables/Cfg.expected

@@ -14,9 +14,9 @@ edges
 | main.rs:4:14:4:20 | ...::format_args_nl!... | main.rs:4:14:4:20 | MacroExpr |  |
 | main.rs:4:14:4:20 | ExprStmt | main.rs:4:5:4:21 | ...::_print |  |
 | main.rs:4:14:4:20 | FormatArgsExpr | main.rs:4:14:4:20 | ...::format_args_nl!... |  |
+| main.rs:4:14:4:20 | MacroBlockExpr | main.rs:4:5:4:21 | println!... |  |
 | main.rs:4:14:4:20 | MacroExpr | main.rs:4:14:4:20 | ...::_print(...) |  |
-| main.rs:4:14:4:20 | MacroStmts | main.rs:4:5:4:21 | println!... |  |
+| main.rs:4:14:4:20 | { ... } | main.rs:4:14:4:20 | MacroBlockExpr |  |
-| main.rs:4:14:4:20 | { ... } | main.rs:4:14:4:20 | MacroStmts |  |
 | main.rs:4:20:4:20 | s | main.rs:4:14:4:20 | FormatArgsExpr |  |
 | main.rs:7:1:9:1 | enter fn print_i64 | main.rs:7:14:7:14 | i |  |
 | main.rs:7:1:9:1 | exit fn print_i64 (normal) | main.rs:7:1:9:1 | exit fn print_i64 |  |
@@ -33,9 +33,9 @@ edges
 | main.rs:8:14:8:20 | ...::format_args_nl!... | main.rs:8:14:8:20 | MacroExpr |  |
 | main.rs:8:14:8:20 | ExprStmt | main.rs:8:5:8:21 | ...::_print |  |
 | main.rs:8:14:8:20 | FormatArgsExpr | main.rs:8:14:8:20 | ...::format_args_nl!... |  |
+| main.rs:8:14:8:20 | MacroBlockExpr | main.rs:8:5:8:21 | println!... |  |
 | main.rs:8:14:8:20 | MacroExpr | main.rs:8:14:8:20 | ...::_print(...) |  |
-| main.rs:8:14:8:20 | MacroStmts | main.rs:8:5:8:21 | println!... |  |
+| main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | MacroBlockExpr |  |
-| main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | MacroStmts |  |
 | main.rs:8:20:8:20 | i | main.rs:8:14:8:20 | FormatArgsExpr |  |
 | main.rs:11:1:13:1 | enter fn print_i64_ref | main.rs:11:18:11:18 | i |  |
 | main.rs:11:1:13:1 | exit fn print_i64_ref (normal) | main.rs:11:1:13:1 | exit fn print_i64_ref |  |
@@ -242,9 +242,9 @@ edges
 | main.rs:94:39:94:42 | "x5" | main.rs:94:34:94:43 | Some(...) |  |
 | main.rs:96:13:96:19 | "not yet implemented" | main.rs:96:13:96:19 | ...::panic(...) |  |
 | main.rs:96:13:96:19 | ...::panic | main.rs:96:13:96:19 | "not yet implemented" |  |
-| main.rs:96:13:96:19 | ...::panic(...) | main.rs:96:13:96:19 | MacroStmts |  |
+| main.rs:96:13:96:19 | ...::panic(...) | main.rs:96:13:96:19 | MacroBlockExpr |  |
+| main.rs:96:13:96:19 | MacroBlockExpr | main.rs:96:13:96:19 | todo!... |  |
 | main.rs:96:13:96:19 | MacroExpr | main.rs:95:14:97:9 | { ... } |  |
-| main.rs:96:13:96:19 | MacroStmts | main.rs:96:13:96:19 | todo!... |  |
 | main.rs:96:13:96:19 | todo!... | main.rs:96:13:96:19 | MacroExpr |  |
 | main.rs:98:5:98:13 | print_str | main.rs:98:15:98:16 | x5 |  |
 | main.rs:98:5:98:17 | print_str(...) | main.rs:93:19:99:1 | { ... } |  |
@@ -428,9 +428,9 @@ edges
 | main.rs:176:22:176:51 | ...::format_args_nl!... | main.rs:176:22:176:51 | MacroExpr |  |
 | main.rs:176:22:176:51 | ExprStmt | main.rs:176:13:176:52 | ...::_print |  |
 | main.rs:176:22:176:51 | FormatArgsExpr | main.rs:176:22:176:51 | ...::format_args_nl!... |  |
+| main.rs:176:22:176:51 | MacroBlockExpr | main.rs:176:13:176:52 | println!... |  |
 | main.rs:176:22:176:51 | MacroExpr | main.rs:176:22:176:51 | ...::_print(...) |  |
-| main.rs:176:22:176:51 | MacroStmts | main.rs:176:13:176:52 | println!... |  |
+| main.rs:176:22:176:51 | { ... } | main.rs:176:22:176:51 | MacroBlockExpr |  |
-| main.rs:176:22:176:51 | { ... } | main.rs:176:22:176:51 | MacroStmts |  |
 | main.rs:178:9:178:29 | ...::Hello {...} | main.rs:178:26:178:27 | id | match |
 | main.rs:178:26:178:27 | id | main.rs:178:26:178:27 | id |  |
 | main.rs:178:26:178:27 | id | main.rs:179:13:179:21 | print_i64 | match |

rust/schema/annotations.py

@@ -1289,7 +1289,7 @@ class _:
     """
 
 
-@annotate(MacroStmts, replace_bases={AstNode: Expr}, cfg=True)
+@annotate(MacroBlockExpr, replace_bases={AstNode: Expr}, cfg=True)
 @rust.doc_test_signature(None)
 class _:
     """

rust/schema/ast.py

@@ -397,8 +397,8 @@ class MacroRules(Item, ):
     token_tree: optional["TokenTree"] | child
     visibility: optional["Visibility"] | child
 
-class MacroStmts(AstNode, ):
+class MacroBlockExpr(AstNode, ):
-    expr: optional["Expr"] | child
+    tail_expr: optional["Expr"] | child
     statements: list["Stmt"] | child
 
 class MacroTypeRepr(TypeRepr, ):