Rust: separate attribute macro and macro call expansions

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

@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs af7f3cf5d0941e7dffd6fa4ce75ac432f433a5367a408fb944176dc1a932883b af7f3cf5d0941e7dffd6fa4ce75ac432f433a5367a408fb944176dc1a932883b
+top.rs 7fa95af0d85ffc251cfcd543129baa8cb0dde9df310194f3aff1868dd66417f4 7fa95af0d85ffc251cfcd543129baa8cb0dde9df310194f3aff1868dd66417f4

rust/extractor/src/generated/top.rs

@@ -5819,8 +5819,8 @@ pub struct Item {
 }
 
 impl Item {
-    pub fn emit_expanded(id: trap::Label<Self>, value: trap::Label<AstNode>, out: &mut trap::Writer) {
+    pub fn emit_attribute_macro_expansion(id: trap::Label<Self>, value: trap::Label<MacroItems>, out: &mut trap::Writer) {
-        out.add_tuple("item_expandeds", vec![id.into(), value.into()]);
+        out.add_tuple("item_attribute_macro_expansions", vec![id.into(), value.into()]);
     }
 }
 
@@ -9771,6 +9771,12 @@ impl trap::TrapEntry for MacroCall {
     }
 }
 
+impl MacroCall {
+    pub fn emit_macro_call_expansion(id: trap::Label<Self>, value: trap::Label<AstNode>, out: &mut trap::Writer) {
+        out.add_tuple("macro_call_macro_call_expansions", vec![id.into(), value.into()]);
+    }
+}
+
 impl trap::TrapClass for MacroCall {
     fn class_name() -> &'static str { "MacroCall" }
 }

rust/extractor/src/translate/base.rs

@@ -328,7 +328,11 @@ impl<'a> Translator<'a> {
             let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
             let kind = expanded.kind();
             if let Some(value) = self.emit_expanded_as(expand_to, expanded) {
-                generated::Item::emit_expanded(label.into(), value, &mut self.trap.writer);
+                generated::MacroCall::emit_macro_call_expansion(
+                    label,
+                    value,
+                    &mut self.trap.writer,
+                );
             } else {
                 let range = self.text_range_for_node(mcall);
                 self.emit_parse_error(mcall, &SyntaxError::new(
@@ -655,8 +659,9 @@ impl<'a> Translator<'a> {
             } = semantics.expand_attr_macro(node)?;
             // TODO emit err?
             self.emit_macro_expansion_parse_errors(node, &expanded);
-            let expanded = self.emit_expanded_as(ExpandTo::Items, expanded)?;
+            let macro_items = ast::MacroItems::cast(expanded)?;
-            generated::Item::emit_expanded(label, expanded, &mut self.trap.writer);
+            let expanded = self.emit_macro_items(&macro_items)?;
+            generated::Item::emit_attribute_macro_expansion(label, expanded, &mut self.trap.writer);
             Some(())
         })();
     }

rust/ql/.generated.list

@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 9452207ba069c4174b9e2903614380c5fb09dccd46e612d6c68ed4305b26ac70 3dbc42e9091ea12456014425df347230471da3afd5e811136a9bc58ba6e5880a
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 016c66674aa4739c82ee92123c7ec2f1247537f4bba3b08a833714fc4a0f998f 8be64927ddce9f98f294a4243edccb1bb8f1b7b8867febcbe498e98d8083e5b4
 lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
@@ -74,7 +74,7 @@ lib/codeql/rust/elements/Impl.qll 6407348d86e73cdb68e414f647260cb82cb90bd40860ba
 lib/codeql/rust/elements/ImplTraitTypeRepr.qll e2d5a3ade0a9eb7dcb7eec229a235581fe6f293d1cb66b1036f6917c01dff981 49367cada57d1873c9c9d2b752ee6191943a23724059b2674c2d7f85497cff97
 lib/codeql/rust/elements/IndexExpr.qll 0e2e9f018d06ae72be0fc4ddbc019a9aacd8a06f42b4c4431760bd149e7f2290 2bcfd557abd53a48e48de7915c4f2089107c62dfb3e732a904848248dfd3727b
 lib/codeql/rust/elements/InferTypeRepr.qll 0a7b3e92512b2b167a8e04d650e12700dbbb8b646b10694056d622ba2501d299 e5e67b7c1124f430750f186da4642e646badcdcf66490dd328af3e64ac8da9e9
-lib/codeql/rust/elements/Item.qll b1c41dcdd51fc94248abd52e838d9ca4d6f8c41f22f7bd1fa2e357b99d237b48 b05416c85d9f2ee67dbf25d2b900c270524b626f0b389fe0c9b90543fd05d8e1
+lib/codeql/rust/elements/Item.qll e4058f50dda638385dcddfc290b52e32158fe3099958ef598ba618195a9e88bb fe1ea393641adb3576ef269ec63bc62edc6fa3d55737e422f636b6e9abfa1f2c
 lib/codeql/rust/elements/ItemList.qll c33e46a9ee45ccb194a0fe5b30a6ad3bcecb0f51486c94e0191a943710a17a7d 5a69c4e7712b4529681c4406d23dc1b6b9e5b3c03552688c55addab271912ed5
 lib/codeql/rust/elements/Label.qll a31d41db351af7f99a55b26cdbbc7f13b4e96b660a74e2f1cc90c17ee8df8d73 689f87cb056c8a2aefe1a0bfc2486a32feb44eb3175803c61961a6aeee53d66e
 lib/codeql/rust/elements/LabelableExpr.qll 598be487cd051b004ab95cbbc3029100069dc9955851c492029d80f230e56f0d 92c49b3cfdaba07982f950e18a8d62dae4e96f5d9ae0d7d2f4292628361f0ddc
@@ -89,10 +89,10 @@ 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/MacroCall.qll 16933db15c6c0dbb717ef442f751ad8f63c444f36a12f8d56b8a05a3e5f71d1b ac05cbf50e4b06f39f58817cddbeac6f804c2d1e4f60956a960d63d495e7183d
+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/MacroItems.qll f2d80ff23634ac6bc3e96e8d73154587f9d24edb56654b5c0ae426124d2709ea f794f751b77fc50d7cc3069c93c22dd3a479182edce15c1b22c8da31d2e30a12
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
 lib/codeql/rust/elements/MacroStmts.qll 6e9a1f90231cb72b27d3ff9479e399a9fba4abd0872a5005ab2fac45d5ca9be0 d6ca3a8254fc45794a93c451a3305c9b4be033a467ad72158d40d6f675a377a0
@@ -316,7 +316,7 @@ lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba044
 lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
 lib/codeql/rust/elements/internal/MacroExprImpl.qll 92dd9f658a85ae407e055f090385f451084de59190d8a00c7e1fba453c3eced4 89d544634fecdbead2ff06a26fc8132e127dab07f38b9322fa14dc55657b9f1a
 lib/codeql/rust/elements/internal/MacroItemsConstructor.qll 8e9ab7ec1e0f50a22605d4e993f99a85ca8059fbb506d67bc8f5a281af367b05 2602f9db31ea0c48192c3dde3bb5625a8ed1cae4cd3408729b9e09318d5bd071
-lib/codeql/rust/elements/internal/MacroItemsImpl.qll 76fd50a1f27336e9efc6d3f73ef4d724f19627cadbaa805d1e14d2cfa4f19899 40c0e512090050b39b69128730f4f4581f51ffd3c687fb52913617bd70a144e9
+lib/codeql/rust/elements/internal/MacroItemsImpl.qll f89f46b578f27241e055acf56e8b4495da042ad37fb3e091f606413d3ac18e14 12e9f6d7196871fb3f0d53cccf19869dc44f623b4888a439a7c213dbe1e439be
 lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a04205fb09795ae38ed106ba1423e86ccbc5e62359eaa2 4fac3f731a1ffd87c1230d561c5236bd28dcde0d1ce0dcd7d7a84ba393669d4a
 lib/codeql/rust/elements/internal/MacroPatImpl.qll 7470e2d88c38c7300a64986f058ba92bb22b4945438e2e0e268f180c4f267b71 c1507df74fc4c92887f3e0a4f857f54b61f174ffae5b1af6fb70f466175d658b
 lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
@@ -536,7 +536,7 @@ lib/codeql/rust/elements/internal/generated/Impl.qll 863281820a933a86e6890e31a25
 lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll a1bbebe97a0421f02d2f2ee6c67c7d9107f897b9ba535ec2652bbd27c35d61df ba1f404a5d39cf560e322294194285302fe84074b173e049333fb7f4e5c8b278
 lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
 lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll dab311562be68a2fcbbe29956b0c3fc66d58348658b734e59f7d080c820093ae ca099ecf9803d3c03b183e4ba19f998e24c881c86027b25037914884ce3de20e
-lib/codeql/rust/elements/internal/generated/Item.qll 24f388cf0d9a47b38b6cfb93bbe92b9f0cbd0b05e9aa0e6adc1d8056b2cd2f57 66a14e6ff2190e8eebf879b02d0a9a38467e293d6be60685a08542ca1fc34803
+lib/codeql/rust/elements/internal/generated/Item.qll 159de50e79228ed910c8b6d7755a6bde42bbf0a47491caffa77b9d8e0503fa88 e016c2e77d2d911048b31aeac62df1cce1c14b1a86449159638a2ca99b1cfa01
 lib/codeql/rust/elements/internal/generated/ItemList.qll 73c8398a96d4caa47a2dc114d76c657bd3fcc59e4c63cb397ffac4a85b8cf8ab 540a13ca68d414e3727c3d53c6b1cc97687994d572bc74b3df99ecc8b7d8e791
 lib/codeql/rust/elements/internal/generated/Label.qll 6630fe16e9d2de6c759ff2684f5b9950bc8566a1525c835c131ebb26f3eea63e 671143775e811fd88ec90961837a6c0ee4db96e54f42efd80c5ae2571661f108
 lib/codeql/rust/elements/internal/generated/LabelableExpr.qll 896fd165b438b60d7169e8f30fa2a94946490c4d284e1bbadfec4253b909ee6c 5c6b029ea0b22cf096df2b15fe6f9384ad3e65b50b253cae7f19a2e5ffb04a58
@@ -551,10 +551,10 @@ 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/MacroCall.qll 8b49d44e6aeac26dc2fc4b9ba03c482c65ebf0cba089d16f9d65e784e48ccbb0 9ecf6e278007adcbdc42ed1c10e7b1c0652b6c64738b780d256c9326afa3b393
+lib/codeql/rust/elements/internal/generated/MacroCall.qll 34845d451a0f2119f8fa096e882e3bb515f9d31a3364e17c3ea3e42c61307b50 f7bb4982ccb2e5d3a9c80e7cfc742620959de06a2446baf96dd002312b575bd6
 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/MacroItems.qll bf10b946e9addb8dd7cef032ebc4480492ab3f9625edbabe69f41dcb81d448fe f6788fe1022e1d699056111d47e0f815eb1fa2826c3b6a6b43c0216d82d3904b
 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 cb4f3c2721a4d0c8522e51f567c675f4fc95f39bac8a2bd97e125d5553515ad2 09b5a739ccee75e6c556b34ecd6f78c7dc799029d9bc7df2e6169098d24f0ccd
@@ -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 b9fe4919578ae4889e6993df712b685da3dc2d6559b2a2b34a466c604623feee 306fb39ad5d3877c8afcce14aa6be67ff099b334279bd0ce6b2012719a1e812a
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 23f333104e9ed2eef07f86de0d122b31f61e1c37923827c95fe2848ae14ec5d7 74d4d3c028110ea1491ebc2a707326b44e273a11c676708e46ada0a5bfc51fe9
 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 6cfbf74f0635ce379cce096cdfe70c33b74c7e3a35d2e3af2e93bc06d374efee 5b20172d0662bdbcca737e94ee6ceefc58503898b9584bef372720fea0be2671
+lib/codeql/rust/elements/internal/generated/Raw.qll 03ebbfdedbc03ab7b1363cd0c806afca26c6f020a0d6d97f2622048e011c12a8 d60479d4739c53c53c63d7be15fd8ce6bf212e80ddda6746534971d867dfed1e
 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
@@ -736,11 +736,11 @@ test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
 test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql ddce26b7dc205fe37651f4b289e62c76b08a2d9e8fdaf911ad22a8fdb2a18bc9 b7c7e3c13582b6424a0afd07588e24a258eff7eb3c8587cc11b20aa054d3c727
+test/extractor-tests/generated/Const/Const.ql 6794d0056060a82258d1e832ad265e2eb276206f0224a3f0eb9221e225370066 0a6134fb5a849ce9bd1a28de783460301cafca5773bd7caa4fb1f774f81b476a
 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
+test/extractor-tests/generated/Const/Const_getAttributeMacroExpansion.ql 82e86399d5cd72621dc8d9cd9f310d3dc7f2ecf208149dab0d202047ccbbd2f8 33df8c5b5044f49ec244e183c61c3b81fabd987f590ba6da4e18e08231343dc8
 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
 test/extractor-tests/generated/Const/Const_getCrateOrigin.ql f042bf15f9bde6c62d129601806c79951a2a131b6388e8df24b1dc5d17fe89f7 7c6decb624f087fda178f87f6609510907d2ed3877b0f36e605e2422b4b13f57
-test/extractor-tests/generated/Const/Const_getExpanded.ql b2d0dc1857413cdf0e222bda4717951239b8af663522990d3949dfc170fab6f5 a21fed32088db850950cb65128f2f946d498aaa6873720b653d4b9b2787c7d00
 test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql 3300b902e1d1f9928cfe918203b87043e13460cfa5348a8c93712d2e26d61ced 71e7b80d3290f17b1c235adaca2c48ae90eb8b2cb24d4c9e6dc66559daf3824c
 test/extractor-tests/generated/Const/Const_getName.ql b876a1964bbb857fbe8852fb05f589fba947a494f343e8c96a1171e791aa2b5e 83655b1fbc67a4a1704439726c1138bb6784553e35b6ac16250b807e6cd0f40c
 test/extractor-tests/generated/Const/Const_getTypeRepr.ql 87c5deaa31014c40a035deaf149d76b3aca15c4560c93dd6f4b1ee5f76714baa f3e6b31e4877849792778d4535bd0389f3afd482a6a02f9ceb7e792e46fca83e
@@ -760,10 +760,10 @@ test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae987
 test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql 513d64b564f359e1022ae6f3d6d4a8ad637f595f01f29a6c2a167d1c2e8f1f99 0c7a7af6ee1005126b9ab77b2a7732821f85f1d2d426312c98206cbbedc19bb2
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql b20720ff0b147d55cea6f2de44d5bf297e79991eaf103938ccd7ab9d129e9656 eb8c9db2581cea00c29d7772de0b0a125be02c37092217a419f1a2b6a9711a6c
-test/extractor-tests/generated/Enum/Enum.ql 31645674671eda7b72230cd20b7a2e856190c3a3244e002ab3558787ed1261d9 1f40ee305173af30b244d8e1421a3e521d446d935ece752da5a62f4e57345412
+test/extractor-tests/generated/Enum/Enum.ql eebc780aef77b87e6062724dd8ddb8f3ad33021061c95924c2c2439798ffbb87 0d19552872a2254f66a78b999a488ce2becdb0b0611b858e0bee2b119ee08eae
 test/extractor-tests/generated/Enum/Enum_getAttr.ql 8109ef2495f4a154e3bb408d549a16c6085e28de3aa9b40b51043af3d007afa7 868cf275a582266ffa8da556d99247bc8af0fdf3b43026c49e250cf0cac64687
+test/extractor-tests/generated/Enum/Enum_getAttributeMacroExpansion.ql 571ec6396fb7fc703b23aab651b3c6c05c9b5cd9d69a9ae8f5e36d69a18c89d3 c04025992f76bce7638728847f1ef835d3a48d3dc3368a4d3b73b778f1334618
 test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql 76d32838b7800ed8e5cab895c9dbea76129f96afab949598bebec2b0cb34b7ff 226d099377c9d499cc614b45aa7e26756124d82f07b797863ad2ac6a6b2f5acb
-test/extractor-tests/generated/Enum/Enum_getExpanded.ql 846117a6ee8e04f3d85dce1963bffcbd4bc9b4a95bfab6295c3c87a2f4eda50e 3a9c57fa5c8f514ec172e98126d21b12abe94a3a8a737fb50c838b47fe287ac4
 test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql 001bb634adc4b20afb241bff41194bc91ba8544d1edd55958a01975e2ac428e1 c7c3fe3dc22a1887981a895a1e5262b1d0ad18f5052c67aa73094586de5212f6
 test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql 2a858a07195a4b26b8c92e28519995bd6eba64889bddd126e161038f4a8d78e0 db188f238db915c67b084bc85aa0784c6a20b97b5a5f1966b3530c4c945b5527
 test/extractor-tests/generated/Enum/Enum_getName.ql 32a8638534f37bfd416a6906114a3bcaf985af118a165b78f2c8fffd9f1841b8 c9ca8030622932dd6ceab7d41e05f86b923f77067b457fb7ec196fe4f4155397
@@ -772,17 +772,17 @@ test/extractor-tests/generated/Enum/Enum_getVisibility.ql 7fdae1b147d3d2ed41e055
 test/extractor-tests/generated/Enum/Enum_getWhereClause.ql 00be944242a2056cd760a59a04d7a4f95910c122fe8ea6eca3efe44be1386b0c 70107b11fb72ed722afa9464acc4a90916822410d6b8bf3b670f6388a193d27d
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 811d3c75a93d081002ecf03f4e299c248f708e3c2708fca9e17b36708da620e5 a4477e67931ba90fd948a7ef778b18b50c8492bae32689356899e7104a6d6794
 test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.ql e269bb222317afe1470eee1be822d305fc37c65bca2999da8d24a86fa9337036 088369d6c5b072192290c34c1828b1068aeedaabdae131594ca529bbb1630548
-test/extractor-tests/generated/ExternBlock/ExternBlock.ql 14da23b2b22f3d61a06103d1416ad416333945fd30b3a07b471f351f682c4e16 eaaf4ac8dc23c17d667bc804ed3b88c816c0c5a6127b76e2781faec52534426c
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql 237040dfe227530c23b77f4039d2a9ed5f247e1e8353dc99099b18d651428db2 49c8672faa8cc503cc12db6f694895ee90e9ab024a8597673fd4a620a39f28cf
 test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql 9b7c7263fcbc84e07361f5b419026a525f781836ede051412b22fb4ddb5d0c6a c3755faa7ffb69ad7d3b4c5d6c7b4d378beca2fa349ea072e3bef4401e18ec99
 test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql 78ed6a2d31ccab67b02da4792e9d2c7c7084a9f20eb065d83f64cd1c0a603d1b e548d4fa8a3dc1ca4b7d7b893897537237a01242c187ac738493b9f5c4700521
+test/extractor-tests/generated/ExternBlock/ExternBlock_getAttributeMacroExpansion.ql 39b006e3acb71272cd0f211d37048949c41cc2cdf5bad1702ca95d7ff889f23f 2fceb9fa8375391cfe3d062f2d96160983d4cf94281e0098ab94c7f182cb008d
 test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql 5a2e0b546e17a998156f48f62e711c8a7b920d352516de3518dfcd0dfedde82d 1d11b8a790c943ef215784907ff2e367b13737a5d1c24ad0d869794114deaa32
-test/extractor-tests/generated/ExternBlock/ExternBlock_getExpanded.ql 13d466cb7d6ab8d7d5a98237775518826675e7107dbd7a3879133841eacfcadc b091495c25ead5e93b7a4d64443ca8c8bfdeb699a802bd601efa0259610cf9e7
 test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql 40d6ee4bcb77c2669e07cf8070cc1aadfca22a638412c8fcf35ff892f5393b0c e9782a3b580e076800a1ad013c8f43cdda5c08fee30947599c0c38c2638820d6
 test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql 2c2b29bdfdc3b27173c068cbaab9946b42053aa14cf371236b4b60ff2e723370 dfc20fc8ef81cdce6f0badd664ef3914d6d49082eb942b1da3f45239b4351e2f
-test/extractor-tests/generated/ExternCrate/ExternCrate.ql 3d4a4db58e34e6baa6689c801dd5c63d609549bcd9fa0c554b32042594a0bc46 63568f79c7b9ceb19c1847f5e8567aec6de5b904ef0215b57c7243fcf5e09a7a
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql 25721ab97d58155c7eb434dc09f458a7cb7346a81d62fae762c84ae0795da06d d8315c4cf2950d87ecf12861cf9ca1e1a5f9312939dce9d01c265b00ba8103fd
 test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql cbe8efdfdbe5d46b4cd28d0e9d3bffcf08f0f9a093acf12314c15b692a9e502e 67fe03af83e4460725f371920277186c13cf1ed35629bce4ed9e23dd3d986b95
+test/extractor-tests/generated/ExternCrate/ExternCrate_getAttributeMacroExpansion.ql 254a0be2f36e593f1473dfc4d4466a959683a4c09d8b8273f33b39f04bb41a7b a087003503a0b611de2cd02da4414bb0bbbc73ef60021376a4748e0e34a44119
 test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql c0bf9ba36beb93dc27cd1c688f18b606f961b687fd7a7afd4b3fc7328373dcfb 312da595252812bd311aecb356dd80f2f7dc5ecf77bc956e6478bbe96ec72fd9
-test/extractor-tests/generated/ExternCrate/ExternCrate_getExpanded.ql 007d4bae6dad9aa2d7db45dfc683a143d6ce1b3dd752233cdc46218e8bdab0b1 e77fe7e5128ee3673aec69aef44dc43f881a3767705866c956472e0137b86b60
 test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql 88e16e2bbef466cec43ace25716e354408b5289f9054eaafe38abafd9df327e3 83a69487e16d59492d44d8c02f0baf7898c88ed5fcf67c73ed89d80f00c69fe8
 test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql 6ce362fb4df37210ce491e2ef4e04c0899a67c7e15b746c37ef87a42b2b5d5f9 5209c8a64d5707e50771521850ff6deae20892d85a82803aad1328c2d6372d09
 test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql 52007ef7745e7ceb394de73212c5566300eb7962d1de669136633aea0263afb2 da98779b9e82a1b985c1b1310f0d43c784e5e66716a791ac0f2a78a10702f34b
@@ -822,12 +822,12 @@ test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 27
 test/extractor-tests/generated/FormatArgsExpr/Format_getArgumentRef.ql 634efdffaae4199aa9d95652cf081a8dc26e88224e24678845f8a67dc24ce090 d0302fee5c50403214771d5c6b896ba7c6e52be10c9bea59720ef2bb954e6f40
 test/extractor-tests/generated/FormatArgsExpr/Format_getPrecisionArgument.ql 0d2140f84d0220b0c72c48c6bd272f4cfe1863d1797eddd16a6e238552a61e4d f4fe9b29697041e30764fa3dea44f125546bfb648f32c3474a1e922a4255c534
 test/extractor-tests/generated/FormatArgsExpr/Format_getWidthArgument.ql 01ef27dd0bfab273e1ddc57ada0e079ece8a2bfd195ce413261006964b444093 acd0161f86010759417015c5b58044467a7f760f288ec4e8525458c54ae9a715
-test/extractor-tests/generated/Function/Function.ql 084e8c4a938e0eea6e2cd47b592021891cb2ad04edbec336f87f0f3faf6a7f32 200b8b17eb09f6df13b2e60869b0329b7a59e3d23a3273d17b03f6addd8ebf89
+test/extractor-tests/generated/Function/Function.ql 2efae1916e8f501668b3dbb2237cda788243fdd643683eda41b108dfdc578a90 6ec948518963985ec41b66e2b3b2b953e1da872dcd052a6d8c8f61c25bf09600
 test/extractor-tests/generated/Function/Function_getAbi.ql e5c9c97de036ddd51cae5d99d41847c35c6b2eabbbd145f4467cb501edc606d8 0b81511528bd0ef9e63b19edfc3cb638d8af43eb87d018fad69d6ef8f8221454
 test/extractor-tests/generated/Function/Function_getAttr.ql 44067ee11bdec8e91774ff10de0704a8c5c1b60816d587378e86bf3d82e1f660 b4bebf9441bda1f2d1e34e9261e07a7468cbabf53cf8047384f3c8b11869f04e
+test/extractor-tests/generated/Function/Function_getAttributeMacroExpansion.ql 17a346a9e5d28af99522520d1af3852db4cae01fb3d290a65c5f84d8d039c345 36fb06b55370828d9bc379cf5fad7f383cdb6f6db6f7377660276943ab0e1ec8
 test/extractor-tests/generated/Function/Function_getBody.ql cf2716a751e309deba703ee4da70e607aae767c1961d3c0ac5b6728f7791f608 3beaf4032924720cb881ef6618a3dd22316f88635c86cbc1be60e3bdad173e21
 test/extractor-tests/generated/Function/Function_getCrateOrigin.ql acec761c56b386600443411cabb438d7a88f3a5e221942b31a2bf949e77c14b4 ff2387acb13eebfad614b808278f057a702ef4a844386680b8767f9bb4438461
-test/extractor-tests/generated/Function/Function_getExpanded.ql dc93cca67a3436543cd5b8e5c291cceacde523b8652f162532b274e717378293 c0c28eeb6c97690dfc82bd97e31db1a6b72c6410b98eb193270a37fc95952518
 test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql 0bcdca25bb92424007cea950409d73ba681e3ffbea53e0508f1d630fccfa8bed ff28c3349f5fc007d5f144e549579bd04870973c0fabef4198edce0fba0ef421
 test/extractor-tests/generated/Function/Function_getGenericParamList.ql 0b255791c153b7cb03a64f1b9ab5beccc832984251f37516e1d06ce311e71c2b d200f90d4dd6f8dfd22ce49203423715d5bef27436c56ee553097c668e71c5a1
 test/extractor-tests/generated/Function/Function_getName.ql 3d9e0518075d161213485389efe0adf8a9e6352dd1c6233ef0403a9abbcc7ed1 841e644ecefff7e9a82f458bcf14d9976d6a6dbe9191755ead88374d7c086375
@@ -848,11 +848,11 @@ test/extractor-tests/generated/IfExpr/IfExpr_getAttr.ql f5872cdbb21683bed689e753
 test/extractor-tests/generated/IfExpr/IfExpr_getCondition.ql 5bab301a1d53fe6ee599edfb17f9c7edb2410ec6ea7108b3f4a5f0a8d14316e3 355183b52cca9dc81591a09891dab799150370fff2034ddcbf7b1e4a7cb43482
 test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 8674cedf42fb7be513fdf6b9c3988308453ae3baf8051649832e7767b366c12f e064e5f0b8e394b080a05a7bccd57277a229c1f985aa4df37daea26aeade4603
 test/extractor-tests/generated/IfExpr/IfExpr_getThen.ql 0989ddab2c231c0ee122ae805ffa0d3f0697fb7b6d9e53ee6d32b9140d4b0421 81028f9cd6b417c63091d46a8b85c3b32b1c77eea885f3f93ae12c99685bfe0a
-test/extractor-tests/generated/Impl/Impl.ql a6e19421a7785408ad5ce8e6508d9f88eceb71fe6f6f4abc5795285ecc778db6 158519bed8a89b8d25921a17f488267af6be626db559bd93bbbe79f07ebfed6c
+test/extractor-tests/generated/Impl/Impl.ql 3a82dc8738ad09d624be31cad86a5a387981ec927d21074ec6c9820c124dfd57 8fabe8e48396fb3ad5102539241e6b1d3d2455e4e5831a1fa2da39e4faf68a0e
 test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql cf875361c53c081ac967482fd3af8daf735b0bc22f21dcf0936fcf70500a001a 0ad723839fa26d30fa1cd2badd01f9453977eba81add7f0f0a0fcb3adb76b87e
 test/extractor-tests/generated/Impl/Impl_getAttr.ql 018bdf6d9a9724d4f497d249de7cecd8bda0ac2340bde64b9b3d7c57482e715b cd065899d92aa35aca5d53ef64eadf7bb195d9a4e8ed632378a4e8c550b850cd
+test/extractor-tests/generated/Impl/Impl_getAttributeMacroExpansion.ql 526d4651f2bc703ee107f72b9940a3062777645d2421a3522429bf1d3925f6a2 c08c3d7501552987e50b28ab12a34abd539f6a395b8636167b109d9a470f195e
 test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql 494d5524ef7bac1286b8a465e833e98409c13f3f8155edab21d72424944f2ed9 b238ef992fce97699b14a5c45d386a2711287fd88fa44d43d18c0cdfd81ed72c
-test/extractor-tests/generated/Impl/Impl_getExpanded.ql ce623514e77f67dda422566531515d839a422e75ea87a10d86ad162fa61e1469 533624938c937835a59326c086e341b7bacab32d84af132e7f3d0d17c6cd4864
 test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql 3ab82fd7831d22c7ec125908abf9238a9e8562087d783c1c12c108b449c31c83 320afd5dd1cea9017dbc25cc31ebe1588d242e273d27207a5ad2578eee638f7e
 test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql 88d5cd8fd03cb4cc2887393ee38b2e2315eeef8c4db40a9bd94cf86b95935bdd 9c72828669ccf8f7ca39851bc36a0c426325a91fc428b49681e4bb680d6547a9
 test/extractor-tests/generated/Impl/Impl_getSelfTy.ql 2962d540a174b38815d150cdd9053796251de4843b7276d051191c6a6c8ecad4 b7156cec08bd6231f7b8f621e823da0642a0eb036b05476222f259101d9d37c0
@@ -900,19 +900,20 @@ 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/MacroCall/MacroCall.ql 989d90726edab22a69377480ce5d1a13309d9aac60e0382c2ad6d36e8c7f1df5 68ffd6e1afa0c2c17fb04f87a09baca9766421aa28acd4ef8a6d04798f4c3a57
+test/extractor-tests/generated/MacroCall/MacroCall.ql 992e338a9c1353030f4bb31cae6ae4a1b957052e28c8753bae5b6d33dbe03fe9 863fbfd712a4f9ed613abb64ecb814b0a72b9ab65c50aa0dc5279d319249ae6a
 test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql c22a2a29d705e85b03a6586d1eda1a2f4f99f95f7dfeb4e6908ec3188b5ad0ad 9b8d9dcc2116a123c15c520a880efab73ade20e08197c64bc3ed0c50902c4672
+test/extractor-tests/generated/MacroCall/MacroCall_getAttributeMacroExpansion.ql 60cf2c12ec7fc3b25ed2a75bb7f3da5689469a65a418ba68db0ab26d0c227967 7f71c88c67834f82ef4bda93a678a084d41e9acb86808c3257b37dfc6c2908d2
 test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql 3030e87de6f773d510882ee4469146f6008898e23a4a4ccabcbaa7da1a4e765e a10fe67315eda1c59d726d538ead34f35ccffc3e121eeda74c286d49a4ce4f54
-test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql 757c4a4c32888e4604044c798a3180aa6d4f73381eec9bc28ba9dc71ffcbd03a 27d5edaa2c1096a24c86744aaad0f006da20d5caa28ccfd8528e7c98aa1bead1
 test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql 553b810f611014ae04d76663d1393c93687df8b96bda325bd71e264e950a8be9 a0e80c3dac6a0e48c635e9f25926b6a97adabd4b3c0e3cfb6766ae160bcb4ee7
+test/extractor-tests/generated/MacroCall/MacroCall_getMacroCallExpansion.ql 1416adaedf6a11680c7261c912aa523db72d015fbfdad3a288999216050380a6 10b87d50f21ac5e1b7706fe3979cab72ecb95f51699540f2659ee161c9186138
 test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql 160edc6a001a2d946da6049ffb21a84b9a3756e85f9a2fb0a4d85058124b399a 1e25dd600f19ef89a99f328f86603bce12190220168387c5a88bfb9926da56d9
 test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql 1cbf6b1ac7fa0910ff299b939743153fc00ad7e28a9a70c69a8297c6841e8238 570380c0dc4b20fe25c0499378569720a6da14bdb058e73d757e174bdd62d0c0
-test/extractor-tests/generated/MacroDef/MacroDef.ql 2b9965d72ba85d531f66e547059110e95a03315889fbb3833cce121c1ad49309 2b5b03afbce92745b1d9750a958b602ccf5e7f9f7934fb12d8b3c20dfc8d3d28
+test/extractor-tests/generated/MacroDef/MacroDef.ql 13ef4bdde6910b09cefe47f8753f092ed61db4d9f3cece0f67071b12af81991c a68091e30a38a9b42373497b79c9b4bde23ef0ab8e3a334ff73bfdde0c9895b2
 test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql 61f11d6ba6ea3bd42708c4dc172be4016277c015d3560025d776e8fef447270f 331541eff1d8a835a9ecc6306f3adf234cbff96ea74b0638e482e03f3e336fd1
 test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql 0a30875f7b02351a4facf454273fb124aa40c6ef8a47dfe5210072a226b03656 8e97307aef71bf93b28f787050bfaa50fe95edf6c3f5418acd07c1de64e62cc1
+test/extractor-tests/generated/MacroDef/MacroDef_getAttributeMacroExpansion.ql bd076cf1bab968a1502467652d73259d1ce0fe7f8af73bdf914e2ed1d903adf7 4673df049b36082be9a5b325f6afa7118b930bccdb5689e57ff7192b21d07345
 test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql 7b350f48e6f208d9fa4725919efd439baf5e9ec4563ba9be261b7a17dacc451b 33f99a707bb89705c92195a5f86055d1f6019bcd33aafcc1942358a6ed413661
 test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql 6c46366798df82ed96b8fb1efeb46bd84c2660f226ff2359af0041d5cdf004ba 8ab22599ef784dcad778d86828318699c2230c8927ae98ab0c60ac4639d6d1b5
-test/extractor-tests/generated/MacroDef/MacroDef_getExpanded.ql 7f2baed8b5a2ba8a6e67cb601e7a03a7d3276673d6bd3b05f83b76058622bc2d 85241a780e2cec0be062042bcea4a3c3282f3694f6bf7faa64a51f1126b1f438
 test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql d09b262b8e5558078506ec370255a63c861ca0c41ab9af3eb4f987325dadd90c cd466062c59b6a8ea2a05ddac1bf5b6d04165755f4773867774215ec5e79afa3
 test/extractor-tests/generated/MacroDef/MacroDef_getName.ql 6bc8a17804f23782e98f7baf70a0a87256a639c11f92e3c80940021319868847 726f9d8249b2ca6789d37bb4248bf5dd044acc9add5c25ed62607502c8af65aa
 test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql d858ccaab381432c529bf4a621afc82ea5e4b810b463f2b1f551de79908e14e7 83a85c4f90417ab44570a862642d8f8fc9208e62ba20ca69b32d39a3190381aa
@@ -922,10 +923,10 @@ test/extractor-tests/generated/MacroItems/MacroItems.ql 876b5d2a4ce7dcb599e02208
 test/extractor-tests/generated/MacroItems/MacroItems_getItem.ql 53fc2db35a23b9aca6ee327d2a51202d23ddf482e6bdd92c5399b7f3a73959b1 63051c8b7a7bfbe9cc640f775e753c9a82f1eb8472989f7d3c8af94fdf26c7a0
 test/extractor-tests/generated/MacroPat/MacroPat.ql d9ec72d4d6a7342ee2d9aa7e90227faa31792ca5842fe948d7fdf22597a123b7 74b0f21ef2bb6c13aae74dba1eea97451755110909a083360e2c56cfbc76fd91
 test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql 398996f0d0f2aa6d3b58d80b26c7d1185b5094d455c6c5c7f075f6d414150aa6 b4662e57cac36ed0e692201f53ba46c3d0826bba99c5cc6dfcb302b44dd2154b
-test/extractor-tests/generated/MacroRules/MacroRules.ql 46c125145d836fd5d781d4eda02f9f09f2d39a35350dffb982610b27e4e4936f 4068314eca12ac08ad7e90ceb8b9d935a355c2fe8c38593972484abde1ac47b4
+test/extractor-tests/generated/MacroRules/MacroRules.ql 3c88db0c2ba65a1871340a5e940b66d471477852a1e3edba59a86234b7a9c498 98778dd95d029e4801c42081238db84a39e3ed60b30932436ea0fb51eedfcda1
 test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql 7de501c724e3465520cdc870c357911e7e7fce147f6fb5ed30ad37f21cf7d932 0d7754b89bcad6c012a0b43ee4e48e64dd20b608b3a7aeb4042f95eec50bb6e6
+test/extractor-tests/generated/MacroRules/MacroRules_getAttributeMacroExpansion.ql 461651a72e5f860864ed4342973a666efa5b5749b7fcb00297808352a93f86e0 8b18a507753014f9faf716061d2366f7768dee0e8ea6c04e5276729306f26ce0
 test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql fccedeee10ef85be3c26f6360b867e81d4ebce3e7f9cf90ccb641c5a14e73e7d 28c38a03a7597a9f56032077102e7a19378b0f3f3a6804e6c234526d0a441997
-test/extractor-tests/generated/MacroRules/MacroRules_getExpanded.ql 01746ce9f525dcf97517d121eb3d80a25a1ee7e1d550b52b3452ee6b8fd83a00 0ccb55088d949fa2cd0d0be34ea5a626c221ae1f35d56ccf2eb20c696d3c157b
 test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql a0098b1d945df46e546e748c2297444aaccd04a4d543ba3d94424e7f33be6d26 3bab748c7f5bbe486f30e1a1c422a421ab622f401f4f865afb003915ae47be83
 test/extractor-tests/generated/MacroRules/MacroRules_getName.ql 591606e3accae8b8fb49e1218c4867a42724ac209cf99786db0e5d7ea0bf55d5 d2936ef5aa4bbf024372516dde3de578990aafb2b8675bbbf0f72e8b54eb82a8
 test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql 7598d33c3d86f9ad8629219b90667b2b65e3a1e18c6b0887291df9455a319cab 69d90446743e78e851145683c17677497fe42ed02f61f2b2974e216dc6e05b01
@@ -961,10 +962,10 @@ test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql 13
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql 77407ac956c897ff7234132de1a825f1af5cfd0b6c1fd3a30f64fe08813d56db d80719e02d19c45bd6534c89ec7255652655f5680199854a0a6552b7c7793249
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql c22504665900715e8a32dd47627111e8cef4ed2646f74a8886dead15fbc85bb5 d92462cf3cb40dcd383bcaffc67d9a43e840494df9d7491339cbd09a0a73427b
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql 9e7bbb7ed60db49b45c3bdf8e01ec58de751889fc394f59ac33f9d6e98200aa1 c055d877e2ff0edc78cce6dd79c78b2881e7940889729cbb5c12e7029ddeb5a3
-test/extractor-tests/generated/Module/Module.ql 3b534dc4377a6411d75c5d1d99ad649acaebd17364af2738cbc86f5a43315028 feeedeb64c4eccba1787bff746ee8009bddead00123de98b8d5ca0b401078443
+test/extractor-tests/generated/Module/Module.ql 9e75a0f22f1f71eb473ebe73e6ffc618cbb59ea9f22b6e8bc85d3fb00b771c52 3eb5201ef046259207cb64fb123a20b01f2e742b7e4dd38400bd24743e2db1ad
 test/extractor-tests/generated/Module/Module_getAttr.ql b97ae3f5175a358bf02c47ec154f7c2a0bd7ca54d0561517008d59344736d5cd f199116633c183826afa9ab8e409c3bf118d8e626647dbc617ae0d40d42e5d25
+test/extractor-tests/generated/Module/Module_getAttributeMacroExpansion.ql 9f7c04c405d25448ed6d0e7bf1bb7fea851ea0e400db2246151dd705292ae3a8 f55d86901c7cf053cd68cb7ceb4d6b786834d2d35394079326ea992e7fbc9ce1
 test/extractor-tests/generated/Module/Module_getCrateOrigin.ql ff479546bf8fe8ef3da60c9c95b7e8e523c415be61839b2fff5f44c146c4e7df b14d3c0577bd6d6e3b6e5f4b93448cdccde424e21327a2e0213715b16c064a52
-test/extractor-tests/generated/Module/Module_getExpanded.ql 03d49dd284795a59b7b5126218e1c8c7ce1cb0284c5070e2d8875e273d9d90fc fa004cf6b464afe0307c767e4dd29bbce7e1c65de61cdd714af542a8b68bbe44
 test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql 55c5b633d05ddbe47d324535a337d5dfed5913ab23cdb826424ddd22009a2a53 ab9e11e334e99be0d4c8d2bd0580657211d05feeeb322fbb5400f07264219497
 test/extractor-tests/generated/Module/Module_getItemList.ql 59b49af9788e9d8b5bceaeffe3c3d203038abd987880a720669117ac3db35388 9550939a0e07b11892b38ca03a0ce305d0e924c28d27f25c9acc47a819088969
 test/extractor-tests/generated/Module/Module_getName.ql 7945dc007146c650cf4f5ac6e312bbd9c8b023246ff77f033a9410da29774ace 9de11a1806487d123376c6a267a332d72cd81e7d6e4baa48669e0bb28b7e352e
@@ -1062,11 +1063,11 @@ test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql a6604f
 test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6
 test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551
 test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95
-test/extractor-tests/generated/Static/Static.ql 271ef78c98c5cb8c80812a1028bb6b21b5e3ae11976ed8276b35832bf41c4798 23ab4c55836873daf500973820d2d5eaa5892925ebdc5d35e314b87997ca6ce3
+test/extractor-tests/generated/Static/Static.ql f5f71ff62984d3b337b2065b0a5bc13eed71a61bbf5869f1a1977c5e35dfdd50 630c4d30987e3ca873487f6f0cf7f498827ae0ace005005acdd573cf0e660f6e
 test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2
+test/extractor-tests/generated/Static/Static_getAttributeMacroExpansion.ql 828ba050c964781dace382e4673c232f2aa80aa4e414d371fd421c3afc2b6902 018f8b75e1779829c87299d2d8f1ab5e7fa1aaa153599da789cf29b599d78477
 test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f
 test/extractor-tests/generated/Static/Static_getCrateOrigin.ql f24ac3dac6a6e04d3cc58ae11b09749114a89816c28b96bf6be0e96b2e20d37f e4051426c5daa7e73c1a5a9023d6e50a2b46ebf194f45befbe3dd45e64831a55
-test/extractor-tests/generated/Static/Static_getExpanded.ql 6f949494cba88f12b1657badd7d15bdd0b6aba73701674a64aac9d30cbb4907f 9ea0c4bb0100482e9ae0b03c410860f10fd88115e854b2516b61732acc634501
 test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql 6ec02f7ec9cf4cb174a7cdf87921758a3e798c76171be85939614305d773b6a0 c51567dac069fc67ece0aa018ae6332187aa1145f33489093e4aee049d7cea52
 test/extractor-tests/generated/Static/Static_getName.ql c7537e166d994b6f961547e8b97ab4328b78cbd038a0eb9afaae42e35f6d9cb4 bb5ae24b85cd7a8340a4ce9e9d56ec3be31558051c82257ccb84289291f38a42
 test/extractor-tests/generated/Static/Static_getTypeRepr.ql 45efcf393a3c6d4eca92416d8d6c88e0d0e85a2bc017da097ae2bbbe8a271a32 374b551e2d58813203df6f475a1701c89508803693e2a4bec7afc86c2d58d60b
@@ -1075,10 +1076,10 @@ test/extractor-tests/generated/StmtList/StmtList.ql 0010df0d5e30f7bed3bd5d916faf
 test/extractor-tests/generated/StmtList/StmtList_getAttr.ql 78d4bf65273498f04238706330b03d0b61dd03b001531f05fcb2230f24ceab64 6e02cee05c0b9f104ddea72b20097034edb76e985188b3f10f079bb03163b830
 test/extractor-tests/generated/StmtList/StmtList_getStatement.ql abbc3bcf98aab395fc851d5cc58c9c8a13fe1bdd531723bec1bc1b8ddbec6614 e302a26079986fa055306a1f641533dfde36c9bc0dd7958d21e2518b59e808c2
 test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql 578d7c944ef42bdb822fc6ce52fe3d49a0012cf7854cfddbb3d5117133700587 64ea407455a3b4dfbb86202e71a72b5abbff885479367b2834c0dd16d1f9d0ee
-test/extractor-tests/generated/Struct/Struct.ql 13d575bd8ca4ad029d233a13a485005bc03f58221b976c7e1df7456ddc788544 fc7cbaaf44d71e66aa8170b1822895fc0d0710d0b3a4da4f1b96ed9633f0b856
+test/extractor-tests/generated/Struct/Struct.ql a4e5d3fe4f994bdf911ebed54a65d237cd5a00510337e911bd5286637bc8ea80 a335224605f3cc35635bf5fd0bebcb50800429c0a82a5aa86a37cb9f6eb3f651
 test/extractor-tests/generated/Struct/Struct_getAttr.ql 028d90ddc5189b82cfc8de20f9e05d98e8a12cc185705481f91dd209f2cb1f87 760780a48c12be4581c1675c46aae054a6198196a55b6b989402cc29b7caf245
+test/extractor-tests/generated/Struct/Struct_getAttributeMacroExpansion.ql a17504527a307615d26c2c4b6c21fe9b508f5a77a741d68ca605d2e69668e385 f755d8965c10568a57ff44432a795a0a36b86007fc7470bc652d555946e19231
 test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql 289622244a1333277d3b1507c5cea7c7dd29a7905774f974d8c2100cea50b35f d32941a2d08d7830b42c263ee336bf54de5240bfc22082341b4420a20a1886c7
-test/extractor-tests/generated/Struct/Struct_getExpanded.ql fc6809bfafce55b6ff1794898fcd08ac220c4b2455782c52a51de64346ed09ba 9bcb24573b63831861b55c7f93af58e19af2929acf9bb1b8da94763bbfcde013
 test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql 866a5893bd0869224fb8aadd071fba35b5386183bb476f5de45c9de7ab88c583 267aedc228d69e31ca8e95dcab6bcb1aa30f9ebaea43896a55016b7d68e3c441
 test/extractor-tests/generated/Struct/Struct_getFieldList.ql f45d6d5d953741e52aca67129994b80f6904b2e6b43c519d6d42c29c7b663c42 77a7d07e8462fa608efc58af97ce8f17c5369f9573f9d200191136607cb0e600
 test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql cd72452713004690b77086163541fa319f8ab5faf503bb4a6a20bcaf2f790d38 4d72e891c5fac6e491d9e18b87ecf680dc423787d6b419da8f700fe1a14bc26f
@@ -1122,21 +1123,21 @@ test/extractor-tests/generated/TokenTree/TokenTree.ql ba2ef197e0566640b57503579f
 test/extractor-tests/generated/Trait/AssocItemList.ql 0ea572b1350f87cc09ce4dc1794b392cc9ad292abb8439c106a7a1afe166868b 6e7493a3ace65c68b714e31234e149f3fc44941c3b4d125892531102b1060b2f
 test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql 8149d905f6fc6caeb51fa1ddec787d0d90f4642687461c7b1a9d4ab93a27d65d 8fb9caad7d88a89dd71e5cc8e17496afbdf33800e58179f424ef482b1b765bb1
 test/extractor-tests/generated/Trait/AssocItemList_getAttr.ql 06526c4a28fd4fdce04ca15fbadc2205b13dcc2d2de24177c370d812e02540e6 79c8ce6e1f8acc1aaca498531e2c1a0e7e2c0f2459d7fc9fe485fd82263c433f
-test/extractor-tests/generated/Trait/Trait.ql a7407c80d297ba0b7651ae5756483c8d81874d20af4123552d929870e9125d13 62e45d36c9791702bc9d4a26eb04f22fe713d120a8e00fe6131032b081bad9f4
+test/extractor-tests/generated/Trait/Trait.ql 064785e9389bdf9abd6e0c8728a90a399af568a24c4b18b32cf1c2be2bcbf0b8 a77e89ac31d12c00d1849cb666ebb1eecc4a612934a0d82cd82ecd4c549c9e97
 test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql 05e6896f60afabf931a244e42f75ee55e09c749954a751d8895846de3121f58f def1f07d9945e8d9b45a659a285b0eb72b37509d20624c88e0a2d34abf7f0c72
 test/extractor-tests/generated/Trait/Trait_getAttr.ql 9711125fa4fc0212b6357f06d1bc50df50b46168d139b649034296c64d732e21 901b6a9d04055b563f13d8742bd770c76ed1b2ccf9a7236a64de9d6d287fbd52
+test/extractor-tests/generated/Trait/Trait_getAttributeMacroExpansion.ql 7ea169336dca0fcaf961f61d811c81834ea28b17b2a01dc57a6e89f5bedc7594 d5a542f84149c0ccd32c7b4a7a19014a99aa63a493f40ea6fbebb83395b788a1
 test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql d8433d63bb2c4b3befaaedc9ce862d1d7edcdf8b83b3fb5529262fab93880d20 3779f2678b3e00aac87259ecfe60903bb564aa5dbbc39adc6c98ad70117d8510
-test/extractor-tests/generated/Trait/Trait_getExpanded.ql 4a6912b74ad6cbfce27c6ffdff781271d182a91a4d781ee02b7ac35b775d681b 14c8df06c3909c9986fc238229208e87b39b238890eb5766af2185c36e3b00c9
 test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql a2bd16e84f057ed8cb6aae3e2a117453a6e312705302f544a1496dbdd6fcb3e6 b4d419045430aa7acbc45f8043acf6bdacd8aff7fdda8a96c70ae6c364c9f4d1
 test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql b27ff28e3aff9ec3369bbbcbee40a07a4bd8af40928c8c1cb7dd1e407a88ffee 2b48e2049df18de61ae3026f8ab4c3e9e517f411605328b37a0b71b288826925
 test/extractor-tests/generated/Trait/Trait_getName.ql d4ff3374f9d6068633bd125ede188fcd3f842f739ede214327cd33c3ace37379 3dcf91c303531113b65ea5205e9b6936c5d8b45cd3ddb60cd89ca7e49f0f00c1
 test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql 8a4eb898424fe476db549207d67ba520999342f708cbb89ee0713e6bbf1c050d 69d01d97d161eef86f24dd0777e510530a4db5b0c31c760a9a3a54f70d6dc144
 test/extractor-tests/generated/Trait/Trait_getVisibility.ql 8f4641558effd13a96c45d902e5726ba5e78fc9f39d3a05b4c72069993c499f4 553cf299e7d60a242cf44f2a68b8349fd8666cc4ccecab5ce200ce44ad244ba9
 test/extractor-tests/generated/Trait/Trait_getWhereClause.ql b34562e7f9ad9003d2ae1f3a9be1b5c141944d3236eae3402a6c73f14652e8ad 509fa3815933737e8996ea2c1540f5d7f3f7de21947b02e10597006967efc9d1
-test/extractor-tests/generated/TraitAlias/TraitAlias.ql 6ba52527c90cd067ce3a48bb5051ba94c3c108444d428244622d381c1264ba55 76acb3a91331fa55c390a1cf2fd70a35052d9019b0216f5e00271ee367607d33
+test/extractor-tests/generated/TraitAlias/TraitAlias.ql c2a36ea7bf5723b9ec1fc24050c99681d9443081386980987bcb5989230a6605 b511356fea3dee5b70fee15369855002775c016db3f292e08293d0bf4b5bd33d
 test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql 128c24196bfa6204fffd4154ff6acebd2d1924bb366809cdb227f33d89e185c8 56e8329e652567f19ef7d4c4933ee670a27c0afb877a0fab060a0a2031d8133e
+test/extractor-tests/generated/TraitAlias/TraitAlias_getAttributeMacroExpansion.ql 029d261d0bdd6fe5bc30011ac72481bce9e5a6029d52fde8bd00932455703276 cad506346840304954e365743c33efed22049f0cbcbb68e21d3a95f7c2e2b301
 test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql 303212122021da7f745050c5de76c756461e5c6e8f4b20e26c43aa63d821c2b6 fdbd024cbe13e34265505147c6faffd997e5c222386c3d9e719cd2a385bde51c
-test/extractor-tests/generated/TraitAlias/TraitAlias_getExpanded.ql 8767d1ffb0a9c1e84c39907d3ab5456aff146e877f7bfe905786ff636a39acd9 9467a2b63f32b84501f4aa1ce1e0fc822845a9239216b9ebf4eaf0c23d6d27f3
 test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql 601b6b0e5e7e7f2926626866085d9a4a9e31dc575791e9bd0019befc0e397193 9bd325414edc35364dba570f6eecc48a8e18c4cbff37d32e920859773c586319
 test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql 5a40c1760fcf5074dc9e9efa1a543fc6223f4e5d2984923355802f91edb307e4 9fd7ab65c1d6affe19f96b1037ec3fb9381e90f602dd4611bb958048710601fa
 test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql e91fa621774b9467ae820f3c408191ac75ad33dd73bcd417d299006a84c1a069 113e0c5dd2e3ac2ddb1fd6b099b9b5c91d5cdd4a02e62d4eb8e575096f7f4c6a
@@ -1164,10 +1165,10 @@ test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOri
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql 150898b6e55cc74b9ddb947f136b5a7f538ee5598928c5724d80e3ddf93ae499 66e0bd7b32df8f5bbe229cc02be6a07cb9ec0fe8b444dad3f5b32282a90551ee
 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f99917a95a85a932f423cba5a619a51cada8e704b93c54b0a8cb5d7a1129fa1 759bd02347c898139ac7dabe207988eea125be24d3e4c2282b791ec810c16ea7
 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql 615acfcbc475b5c2ffa8e46d023fc2e19d29ee879b4949644a7f0b25c33125e6 81b037af5dcb8a0489a7a81a0ad668ca781b71d4406c123c4f1c4f558722f13e
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql b7c4adb8322a2032657f4417471e7001dbe8236da79af963d6ac5ddf6c4e7c8a 7504a27f32fd76520398c95abd6adeca67be5b71ff4b8abdd086eb29c0d698fc
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 5cbf0b82a25a492c153b4663e5a2c0bea4b15ff53fa22ba1217edaf3bb48c6af d28e6a9eafff3fb84a6f38e3c79ad0d54cb08c7609cd43c968efd3fbc4154957
 test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382
+test/extractor-tests/generated/TypeAlias/TypeAlias_getAttributeMacroExpansion.ql fa2f0867039866e6405a735f9251de182429d3f1fdf00a749c7cfc3e3d62a7bb 56083d34fffd07a43b5736479b4d3b191d138415759639e9dd60789fefe5cb6f
 test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql cd66db5b43bcb46a6cf6db8c262fd524017ef67cdb67c010af61fab303e3bc65 2aebae618448530ec537709c5381359ea98399db83eeae3be88825ebefa1829d
-test/extractor-tests/generated/TypeAlias/TypeAlias_getExpanded.ql dc797269de5b29409484577d4f2e4de9462a1001232a57c141c1e9d3f0e7ad74 d2c3d55fcdf077523ceb899d11d479db15b449b5e82eb8610cb637ae79ef74e6
 test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql fe9c4132e65b54eb071b779e508e9ed0081d860df20f8d4748332b45b7215fd5 448c10c3f8f785c380ce430996af4040419d8dccfa86f75253b6af83d2c8f1c9
 test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql e7e936458dce5a8c6675485a49e2769b6dbff29c112ed744c880e0fc7ae740ef e5fcf3a33d2416db6b0a73401a3cbc0cece22d0e06794e01a1645f2b3bca9306
 test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql 757deb3493764677de3eb1ff7cc119a469482b7277ed01eb8aa0c38b4a8797fb 5efed24a6968544b10ff44bfac7d0432a9621bde0e53b8477563d600d4847825
@@ -1190,20 +1191,20 @@ test/extractor-tests/generated/TypeParam/TypeParam_getName.ql 9d5b6d6a9f2a5793e2
 test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql 080a6b370ad460bf128fdfd632aa443af2ad91c3483e192ad756eb234dbfa4d8 8b048d282963f670db357f1eef9b8339f83d03adf57489a22b441d5c782aff62
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 4ad6ed0c803fb4f58094a55b866940b947b16259756c674200172551ee6546e0 d3270bdcc4c026325159bd2a59848eb51d96298b2bf21402ea0a83ac1ea6d291
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql d8502be88bcd97465f387c410b5078a4709e32b2baa556a4918ea5e609c40dd7 b238dc37404254e3e7806d50a7b1453e17e71da122931331b16a55853d3a843f
-test/extractor-tests/generated/Union/Union.ql ef8005f4ac5d3e6f308b3bb1a1861403674cbb1b72e6558573e9506865ae985e 88933d0f9500ce61a847fbb792fd778d77a4e7379fc353d2a9f5060773eda64f
+test/extractor-tests/generated/Union/Union.ql 2795c83d4511fadf24cc66a762adbabca084bc6ac48501715f666979d2ea9ea5 7efae5209ae3ee8c73cd1c9e9e05f01b3fdda65d9a553c2ac5216351b6f15e5c
 test/extractor-tests/generated/Union/Union_getAttr.ql 42fa0878a6566208863b1d884baf7b68b46089827fdb1dbbfacbfccf5966a9a2 54aa94f0281ca80d1a4bdb0e2240f4384af2ab8d50f251875d1877d0964579fc
+test/extractor-tests/generated/Union/Union_getAttributeMacroExpansion.ql ddd0133a497dc057a353b86acc8ed991fefeaefa335d8ad9fe95109a90e39e54 fcaed4287815226843157c007674b1f1405cae31856fed1113d569bab5608d9b
 test/extractor-tests/generated/Union/Union_getCrateOrigin.ql c218308cf17b1490550229a725542d248617661b1a5fa14e9b0e18d29c5ecc00 e0489242c8ff7aa4dbfdebcd46a5e0d9bea0aa618eb0617e76b9b6f863a2907a
-test/extractor-tests/generated/Union/Union_getExpanded.ql a096814a812662a419b50aa9fd66ab2f6be9d4471df3d50351e9d0bcf061f194 51b406644ee819d74f1b80cdb3a451fa1fad6e6a65d89fa6e3dc87516d9d4292
 test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql 6268ddb68c3e05906e3fc85e40635925b84e5c7290746ded9c6814d362033068 04473b3b9891012e95733463018db8da0e96659ea0b10458b33dc857c091d278
 test/extractor-tests/generated/Union/Union_getGenericParamList.ql c55156ae26b766e385be7d21e67f8c3c45c29274201c93d660077fcc47e1ceee 4c4d338e17c32876ef6e51fd19cff67d125dd89c10e939dfaadbac824bef6a68
 test/extractor-tests/generated/Union/Union_getName.ql 17247183e1a8c8bbb15e67120f65ca323630bddeb614fa8a48e1e74319f8ed37 e21c2a0205bc991ba86f3e508451ef31398bdf5441f6d2a3f72113aaae9e152b
 test/extractor-tests/generated/Union/Union_getStructFieldList.ql ae42dec53a42bcb712ec5e94a3137a5c0b7743ea3b635e44e7af8a0d59e59182 61b34bb8d6e05d9eb34ce353eef7cc07c684179bf2e3fdf9f5541e04bef41425
 test/extractor-tests/generated/Union/Union_getVisibility.ql 86628736a677343d816e541ba76db02bdae3390f8367c09be3c1ff46d1ae8274 6514cdf4bfad8d9c968de290cc981be1063c0919051822cc6fdb03e8a891f123
 test/extractor-tests/generated/Union/Union_getWhereClause.ql 508e68ffa87f4eca2e2f9c894d215ea76070d628a294809dc267082b9e36a359 29da765d11794441a32a5745d4cf594495a9733e28189d898f64da864817894f
-test/extractor-tests/generated/Use/Use.ql 9a0a5efb8118830355fb90bc850de011ae8586c12dce92cfc8f39a870dd52100 7fd580282752a8e6a8ea9ac33ff23a950304030bc32cfbd3b9771368723fb8d6
+test/extractor-tests/generated/Use/Use.ql 1adafd3adcfbf907250ce3592599d96c64572e381937fa11d11ce6d4f35cfd7f 2671e34197df8002142b5facb5380604e807e87aa41e7f8e32dc6d1eefb695f1
 test/extractor-tests/generated/Use/Use_getAttr.ql 6d43c25401398108553508aabb32ca476b3072060bb73eb07b1b60823a01f964 84e6f6953b4aa9a7472082f0a4f2df26ab1d157529ab2c661f0031603c94bb1d
+test/extractor-tests/generated/Use/Use_getAttributeMacroExpansion.ql d02562044449f6de2c70241e0964a8dedb7d1f722c2a98ee9c96638841fa1bc5 a1db982e16b35f1a0ab4091999437a471018afd9f4f01504723aa989d49e4034
 test/extractor-tests/generated/Use/Use_getCrateOrigin.ql 912ebc1089aa3390d4142a39ea73d5490eae525d1fb51654fdd05e9dd48a94b6 c59e36362016ae536421e6d517889cea0b2670818ea1f9e997796f51a9b381e2
-test/extractor-tests/generated/Use/Use_getExpanded.ql 386631ee0ee002d3d6f7f6e48c87d2bb2c4349aa3692d16730c0bc31853b11cf 50e03f47cc1099d7f2f27724ea82d3b69b85e826b66736361b0cbeceb88f88a4
 test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql ccfde95c861cf4199e688b6efeeee9dab58a27cfecd520e39cc20f89143c03c9 6ff93df4134667d7cb74ae7efe102fe2db3ad4c67b4b5a0f8955f21997806f16
 test/extractor-tests/generated/Use/Use_getUseTree.ql 1dfe6bb40b29fbf823d67fecfc36ba928b43f17c38227b8eedf19fa252edf3af aacdcc4cf418ef1eec267287d2af905fe73f5bcfb080ef5373d08da31c608720
 test/extractor-tests/generated/Use/Use_getVisibility.ql 587f80acdd780042c48aeb347004be5e9fd9df063d263e6e4f2b660c48c53a8f 0c2c04f95838bca93dfe93fa208e1df7677797efc62b4e8052a4f9c5d20831dd

rust/ql/.gitattributes

@@ -740,9 +740,9 @@
 /test/extractor-tests/generated/Comment/Comment.ql linguist-generated
 /test/extractor-tests/generated/Const/Const.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getBody.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Const/Const_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getName.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getTypeRepr.ql linguist-generated
@@ -764,8 +764,8 @@
 /test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Enum/Enum_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Enum/Enum_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getName.ql linguist-generated
@@ -777,14 +777,14 @@
 /test/extractor-tests/generated/ExternBlock/ExternBlock.ql linguist-generated
 /test/extractor-tests/generated/ExternBlock/ExternBlock_getAbi.ql linguist-generated
 /test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/ExternBlock/ExternBlock_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/ExternCrate/ExternCrate_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql linguist-generated
@@ -827,9 +827,9 @@
 /test/extractor-tests/generated/Function/Function.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getAbi.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getBody.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Function/Function_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getName.ql linguist-generated
@@ -853,8 +853,8 @@
 /test/extractor-tests/generated/Impl/Impl.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getAssocItemList.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Impl/Impl_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Impl/Impl_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getSelfTy.ql linguist-generated
@@ -904,17 +904,18 @@
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.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_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql linguist-generated
+/test/extractor-tests/generated/MacroCall/MacroCall_getMacroCallExpansion.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getPath.ql linguist-generated
 /test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getArgs.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroDef/MacroDef_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getBody.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/MacroDef/MacroDef_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getName.ql linguist-generated
 /test/extractor-tests/generated/MacroDef/MacroDef_getVisibility.ql linguist-generated
@@ -926,8 +927,8 @@
 /test/extractor-tests/generated/MacroPat/MacroPat_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql linguist-generated
+/test/extractor-tests/generated/MacroRules/MacroRules_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/MacroRules/MacroRules_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getName.ql linguist-generated
 /test/extractor-tests/generated/MacroRules/MacroRules_getTokenTree.ql linguist-generated
@@ -965,8 +966,8 @@
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql linguist-generated
 /test/extractor-tests/generated/Module/Module.ql linguist-generated
 /test/extractor-tests/generated/Module/Module_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Module/Module_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Module/Module_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Module/Module_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Module/Module_getItemList.ql linguist-generated
 /test/extractor-tests/generated/Module/Module_getName.ql linguist-generated
@@ -1066,9 +1067,9 @@
 /test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql linguist-generated
 /test/extractor-tests/generated/Static/Static.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getBody.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Static/Static_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getName.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getTypeRepr.ql linguist-generated
@@ -1079,8 +1080,8 @@
 /test/extractor-tests/generated/StmtList/StmtList_getTailExpr.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Struct/Struct_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Struct/Struct_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getFieldList.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql linguist-generated
@@ -1127,8 +1128,8 @@
 /test/extractor-tests/generated/Trait/Trait.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getAssocItemList.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Trait/Trait_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Trait/Trait_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait_getName.ql linguist-generated
@@ -1137,8 +1138,8 @@
 /test/extractor-tests/generated/Trait/Trait_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/TraitAlias/TraitAlias_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TraitAlias/TraitAlias_getName.ql linguist-generated
@@ -1168,8 +1169,8 @@
 /test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/TypeAlias/TypeAlias_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql linguist-generated
@@ -1194,8 +1195,8 @@
 /test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/Union/Union.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Union/Union_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getName.ql linguist-generated
@@ -1204,8 +1205,8 @@
 /test/extractor-tests/generated/Union/Union_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/Use/Use.ql linguist-generated
 /test/extractor-tests/generated/Use/Use_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Use/Use_getAttributeMacroExpansion.ql linguist-generated
 /test/extractor-tests/generated/Use/Use_getCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/Use/Use_getExpanded.ql linguist-generated
 /test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Use/Use_getUseTree.ql linguist-generated
 /test/extractor-tests/generated/Use/Use_getVisibility.ql linguist-generated

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

@@ -217,7 +217,7 @@ final class MacroCallCfgNode extends Nodes::MacroCallCfgNode {
 
   /** Gets the CFG node for the expansion of this macro call, if it exists. */
   CfgNode getExpandedNode() {
-    any(ChildMapping mapping).hasCfgChild(node, node.getExpanded(), this, result)
+    any(ChildMapping mapping).hasCfgChild(node, node.getMacroCallExpansion(), this, result)
   }
 }
 

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

@@ -75,7 +75,7 @@ class StructPatChildMapping extends ParentAstNode, StructPat {
 }
 
 class MacroCallChildMapping extends ParentAstNode, MacroCall {
-  override predicate relevantChild(AstNode child) { child = this.getExpanded() }
+  override predicate relevantChild(AstNode child) { child = this.getMacroCallExpansion() }
 }
 
 class FormatArgsExprChildMapping extends ParentAstNode, CfgImpl::ExprTrees::FormatArgsExprTree {

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

@@ -160,7 +160,7 @@ private predicate guaranteedMatchPosition(Pat pat) {
     parent.(OrPat).getLastPat() = pat
     or
     // for macro patterns we propagate to the expanded pattern
-    parent.(MacroPat).getMacroCall().getExpanded() = pat
+    parent.(MacroPat).getMacroCall().getMacroCallExpansion() = pat
   )
 }
 

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

@@ -143,7 +143,7 @@ class LetStmtTree extends PreOrderTree, LetStmt {
 }
 
 class MacroCallTree extends StandardPostOrderTree, MacroCall {
-  override AstNode getChildNode(int i) { i = 0 and result = this.getExpanded() }
+  override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCallExpansion() }
 }
 
 class MacroStmtsTree extends StandardPreOrderTree, MacroStmts {
@@ -685,7 +685,7 @@ module PatternTrees {
   }
 
   class MacroPatTree extends PreOrderPatTree, MacroPat {
-    override Pat getPat(int i) { i = 0 and result = this.getMacroCall().getExpanded() }
+    override Pat getPat(int i) { i = 0 and result = this.getMacroCall().getMacroCallExpansion() }
   }
 
   class OrPatTree extends PostOrderPatTree instanceof OrPat {

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

@@ -1818,6 +1818,16 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        * Holds if `getTokenTree()` exists.
        */
       predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+      /**
+       * Gets the macro call expansion of this macro call, if it exists.
+       */
+      AstNode getMacroCallExpansion() { result = node.getMacroCallExpansion() }
+
+      /**
+       * Holds if `getMacroCallExpansion()` exists.
+       */
+      predicate hasMacroCallExpansion() { exists(this.getMacroCallExpansion()) }
     }
 
     final private class ParentMacroExpr extends ParentAstNode, MacroExpr {

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

@@ -5,7 +5,7 @@
 
 private import internal.ItemImpl
 import codeql.rust.elements.Addressable
-import codeql.rust.elements.AstNode
+import codeql.rust.elements.MacroItems
 import codeql.rust.elements.Stmt
 
 /**

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

@@ -5,6 +5,7 @@
 
 private import internal.MacroCallImpl
 import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Item

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

@@ -8,10 +8,18 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.Item
 
 /**
- * A sequence of items generated by a `MacroCall`. For example:
+ * A sequence of items generated by a macro. For example:
  * ```rust
  * mod foo{
  *     include!("common_definitions.rs");
+ *
+ *     #[an_attribute_macro]
+ *     fn foo() {
+ *         println!("Hello, world!");
+ *     }
+ *
+ *     #[derive(Debug)]
+ *     struct Bar;
  * }
  * ```
  */

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

@@ -60,7 +60,7 @@ module Impl {
 
     /** Holds if this node is inside a macro expansion. */
     predicate isInMacroExpansion() {
-      this = any(MacroCall mc).getExpanded()
+      this = any(MacroCall mc).getMacroCallExpansion()
       or
       this.getParentNode().isInMacroExpansion()
     }

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

@@ -13,10 +13,18 @@ private import codeql.rust.elements.internal.generated.MacroItems
  */
 module Impl {
   /**
-   * A sequence of items generated by a `MacroCall`. For example:
+   * A sequence of items generated by a macro. For example:
    * ```rust
    * mod foo{
    *     include!("common_definitions.rs");
+   *
+   *     #[an_attribute_macro]
+   *     fn foo() {
+   *         println!("Hello, world!");
+   *     }
+   *
+   *     #[derive(Debug)]
+   *     struct Bar;
    * }
    * ```
    */

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

@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AddressableImpl::Impl as AddressableImpl
-import codeql.rust.elements.AstNode
+import codeql.rust.elements.MacroItems
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
 
 /**
@@ -25,15 +25,18 @@ module Generated {
    */
   class Item extends Synth::TItem, StmtImpl::Stmt, AddressableImpl::Addressable {
     /**
-     * Gets the expanded attribute or procedural macro call of this item, if it exists.
+     * Gets the attribute macro expansion of this item, if it exists.
      */
-    AstNode getExpanded() {
+    MacroItems getAttributeMacroExpansion() {
-      result = Synth::convertAstNodeFromRaw(Synth::convertItemToRaw(this).(Raw::Item).getExpanded())
+      result =
+        Synth::convertMacroItemsFromRaw(Synth::convertItemToRaw(this)
+              .(Raw::Item)
+              .getAttributeMacroExpansion())
     }
 
     /**
-     * Holds if `getExpanded()` exists.
+     * Holds if `getAttributeMacroExpansion()` exists.
      */
-    final predicate hasExpanded() { exists(this.getExpanded()) }
+    final predicate hasAttributeMacroExpansion() { exists(this.getAttributeMacroExpansion()) }
   }
 }

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

@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
@@ -76,5 +77,20 @@ module Generated {
      * Holds if `getTokenTree()` exists.
      */
     final predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+    /**
+     * Gets the macro call expansion of this macro call, if it exists.
+     */
+    AstNode getMacroCallExpansion() {
+      result =
+        Synth::convertAstNodeFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getMacroCallExpansion())
+    }
+
+    /**
+     * Holds if `getMacroCallExpansion()` exists.
+     */
+    final predicate hasMacroCallExpansion() { exists(this.getMacroCallExpansion()) }
   }
 }

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

@@ -15,10 +15,18 @@ import codeql.rust.elements.Item
  */
 module Generated {
   /**
-   * A sequence of items generated by a `MacroCall`. For example:
+   * A sequence of items generated by a macro. For example:
    * ```rust
    * mod foo{
    *     include!("common_definitions.rs");
+   *
+   *     #[an_attribute_macro]
+   *     fn foo() {
+   *         println!("Hello, world!");
+   *     }
+   *
+   *     #[derive(Debug)]
+   *     struct Bar;
    * }
    * ```
    * INTERNAL: Do not reference the `Generated::MacroItems` class directly.

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

@@ -2204,13 +2204,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfItem(Item e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int bAddressable, int n, int nExpanded |
+    exists(int b, int bStmt, int bAddressable, int n, int nAttributeMacroExpansion |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
       bAddressable =
         bStmt + 1 + max(int i | i = -1 or exists(getImmediateChildOfAddressable(e, i, _)) | i) and
       n = bAddressable and
-      nExpanded = n + 1 and
+      nAttributeMacroExpansion = n + 1 and
       (
         none()
         or
@@ -2218,7 +2218,9 @@ private module Impl {
         or
         result = getImmediateChildOfAddressable(e, index - bStmt, partialPredicateCall)
         or
-        index = n and result = e.getExpanded() and partialPredicateCall = "Expanded()"
+        index = n and
+        result = e.getAttributeMacroExpansion() and
+        partialPredicateCall = "AttributeMacroExpansion()"
       )
     )
   }
@@ -3498,7 +3500,8 @@ private module Impl {
 
   private Element getImmediateChildOfMacroCall(MacroCall e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath, int nTokenTree
+      int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath,
+      int nTokenTree, int nMacroCallExpansion
     |
       b = 0 and
       bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
@@ -3509,6 +3512,7 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nPath = nAttr + 1 and
       nTokenTree = nPath + 1 and
+      nMacroCallExpansion = nTokenTree + 1 and
       (
         none()
         or
@@ -3524,6 +3528,10 @@ private module Impl {
         index = nAttr and result = e.getPath() and partialPredicateCall = "Path()"
         or
         index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+        or
+        index = nTokenTree and
+        result = e.getMacroCallExpansion() and
+        partialPredicateCall = "MacroCallExpansion()"
       )
     )
   }

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

@@ -486,10 +486,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A sequence of items generated by a `MacroCall`. For example:
+   * A sequence of items generated by a macro. For example:
    * ```rust
    * mod foo{
    *     include!("common_definitions.rs");
+   *
+   *     #[an_attribute_macro]
+   *     fn foo() {
+   *         println!("Hello, world!");
+   *     }
+   *
+   *     #[derive(Debug)]
+   *     struct Bar;
    * }
    * ```
    */
@@ -2182,9 +2190,9 @@ module Raw {
    */
   class Item extends @item, Stmt, Addressable {
     /**
-     * Gets the expanded attribute or procedural macro call of this item, if it exists.
+     * Gets the attribute macro expansion of this item, if it exists.
      */
-    AstNode getExpanded() { item_expandeds(this, result) }
+    MacroItems getAttributeMacroExpansion() { item_attribute_macro_expansions(this, result) }
   }
 
   /**
@@ -3625,6 +3633,11 @@ module Raw {
      * Gets the token tree of this macro call, if it exists.
      */
     TokenTree getTokenTree() { macro_call_token_trees(this, result) }
+
+    /**
+     * Gets the macro call expansion of this macro call, if it exists.
+     */
+    AstNode getMacroCallExpansion() { macro_call_macro_call_expansions(this, result) }
   }
 
   /**

rust/ql/lib/rust.dbscheme

@@ -1960,9 +1960,9 @@ infer_type_reprs(
 ;
 
 #keyset[id]
-item_expandeds(
+item_attribute_macro_expansions(
   int id: @item ref,
-  int expanded: @ast_node ref
+  int attribute_macro_expansion: @macro_items ref
 );
 
 @labelable_expr =
@@ -3088,6 +3088,12 @@ macro_call_token_trees(
   int token_tree: @token_tree ref
 );
 
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
 macro_defs(
   unique int id: @macro_def
 );

rust/ql/lib/upgrades/e8707b675dc574aca9863eabcc09ac76f15bb9c2/rust.dbscheme

@@ -1960,9 +1960,9 @@ infer_type_reprs(
 ;
 
 #keyset[id]
-item_expandeds(
+item_attribute_macro_expansions(
   int id: @item ref,
-  int expanded: @ast_node ref
+  int attribute_macro_expansion: @macro_items ref
 );
 
 @labelable_expr =
@@ -3088,6 +3088,12 @@ macro_call_token_trees(
   int token_tree: @token_tree ref
 );
 
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
 macro_defs(
   unique int id: @macro_def
 );

rust/ql/lib/upgrades/e8707b675dc574aca9863eabcc09ac76f15bb9c2/upgrade.properties

@@ -1,4 +1,4 @@
-description: Add `expanded` to all `@item` elements
+description: Rename `expanded` to `macro_call_expansion`
 compatibility: backwards
-item_expandeds.rel: reorder macro_call_expandeds.rel (@macro_call id, @ast_node expanded) id expanded
+macro_call_macro_call_expansions.rel: reorder macro_call_expandeds.rel (@macro_call id, @ast_node expanded) id expanded
 macro_call_expandeds.rel: delete

rust/ql/test/extractor-tests/attribute_macro_expansion/test.expected

@@ -1,2 +0,0 @@
-| attr_macro_expansion.rs:1:1:2:11 | fn foo | attr_macro_expansion.rs:2:4:2:6 | Static |
-| attr_macro_expansion.rs:1:1:2:11 | fn foo | attr_macro_expansion.rs:2:4:2:10 | fn foo |

rust/ql/test/extractor-tests/attribute_macro_expansion/test.ql

@@ -1,6 +0,0 @@
-import rust
-import TestUtils
-
-from Item i, MacroItems items, Item expanded
-where toBeTested(i) and i.getExpanded() = items and items.getAnItem() = expanded
-select i, expanded

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

@@ -59,7 +59,7 @@ LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0
 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
+MacroItems/gen_macro_items.rs c00f8045d9a7d6562da1d0136b335b685e2ec5dbd708763faa24a752e89feda4 c00f8045d9a7d6562da1d0136b335b685e2ec5dbd708763faa24a752e89feda4
 MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
 MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
 MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b

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

@@ -3,9 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Const x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasBody, string isConst, string isDefault, string hasName,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasBody, string isConst,
-  string hasTypeRepr, string hasVisibility
+  string isDefault, string hasName, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
@@ -24,6 +28,6 @@ where
   (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr,
+  "hasBody:", hasBody, "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName,
-  "hasVisibility:", hasVisibility
+  "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/Const/Const_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Const x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,7 +3,7 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Enum x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Enum x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAttributeMacroExpansion,
   int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasVariantList,
   string hasVisibility, string hasWhereClause
 where
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
@@ -23,6 +27,6 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  hasGenericParamList, "hasName:", hasName, "hasVariantList:", hasVariantList, "hasVisibility:",
+  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVariantList:",
-  hasVisibility, "hasWhereClause:", hasWhereClause
+  hasVariantList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Enum/Enum_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Enum x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ExternBlock x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  ExternBlock x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  string hasAbi, int getNumberOfAttrs, string hasExternItemList, string isUnsafe
+  string hasAttributeMacroExpansion, string hasAbi, int getNumberOfAttrs, string hasExternItemList,
+  string isUnsafe
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,11 +15,15 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no") and
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasAbi:", hasAbi, "getNumberOfAttrs:",
-  "hasExternItemList:", hasExternItemList, "isUnsafe:", isUnsafe
+  getNumberOfAttrs, "hasExternItemList:", hasExternItemList, "isUnsafe:", isUnsafe

rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from ExternBlock x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasIdentifier, string hasRename, string hasVisibility
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasIdentifier, string hasRename,
+  string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,11 +15,15 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   (if x.hasRename() then hasRename = "yes" else hasRename = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasIdentifier:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  hasIdentifier, "hasRename:", hasRename, "hasVisibility:", hasVisibility
+  "hasIdentifier:", hasIdentifier, "hasRename:", hasRename, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from ExternCrate x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
-| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |

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

@@ -4,7 +4,7 @@ import TestUtils
 
 from
   Function x, string hasParamList, int getNumberOfAttrs, string hasExtendedCanonicalPath,
-  string hasCrateOrigin, string hasExpanded, string hasAbi, string hasBody,
+  string hasCrateOrigin, string hasAttributeMacroExpansion, string hasAbi, string hasBody,
   string hasGenericParamList, string isAsync, string isConst, string isDefault, string isGen,
   string isUnsafe, string hasName, string hasRetType, string hasVisibility, string hasWhereClause
 where
@@ -18,7 +18,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
@@ -33,7 +37,7 @@ where
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs,
   "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "hasAbi:", hasAbi, "hasBody:", hasBody, "hasGenericParamList:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasAbi:", hasAbi, "hasBody:", hasBody,
-  hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst, "isDefault:", isDefault, "isGen:",
+  "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
-  isGen, "isUnsafe:", isUnsafe, "hasName:", hasName, "hasRetType:", hasRetType, "hasVisibility:",
+  "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, "hasName:", hasName,
-  hasVisibility, "hasWhereClause:", hasWhereClause
+  "hasRetType:", hasRetType, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Function/Function_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Function x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,7 +3,7 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Impl x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Impl x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAttributeMacroExpansion,
   string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isConst,
   string isDefault, string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility,
   string hasWhereClause
@@ -16,7 +16,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
@@ -28,7 +32,7 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasAssocItemList:", hasAssocItemList,
-  getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isConst:", isConst, "isDefault:",
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isConst:",
-  isDefault, "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait,
+  isConst, "isDefault:", isDefault, "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:",
-  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  hasTrait, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Impl/Impl_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Impl x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | todo!... | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasExpanded: | yes | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes |
+| gen_macro_call.rs:5:5:5:11 | todo!... | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasMacroCallExpansion: | yes |

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MacroCall x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  MacroCall x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasPath, string hasTokenTree
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasPath, string hasTokenTree,
+  string hasMacroCallExpansion
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,10 +15,16 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no"
+  (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and
+  if x.hasMacroCallExpansion() then hasMacroCallExpansion = "yes" else hasMacroCallExpansion = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasTokenTree:", hasTokenTree
+  "hasPath:", hasPath, "hasTokenTree:", hasTokenTree, "hasMacroCallExpansion:",
+  hasMacroCallExpansion

rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getAttributeMacroExpansion.ql

@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MacroCall x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getAttributeMacroExpansion()

rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getMacroCallExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from MacroCall x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getMacroCallExpansion()

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MacroDef x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  MacroDef x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  string hasArgs, int getNumberOfAttrs, string hasBody, string hasName, string hasVisibility
+  string hasAttributeMacroExpansion, string hasArgs, int getNumberOfAttrs, string hasBody,
+  string hasName, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,12 +15,17 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   (if x.hasArgs() then hasArgs = "yes" else hasArgs = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "hasArgs:", hasArgs, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasArgs:", hasArgs,
-  "hasBody:", hasBody, "hasName:", hasName, "hasVisibility:", hasVisibility
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:", hasName, "hasVisibility:",
+  hasVisibility

rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from MacroDef x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

rust/ql/test/extractor-tests/generated/MacroItems/gen_macro_items.rs

@@ -1,6 +1,14 @@
 // generated by codegen, do not edit
 
-// A sequence of items generated by a `MacroCall`. For example:
+// A sequence of items generated by a macro. For example:
 mod foo{
     include!("common_definitions.rs");
+
+    #[an_attribute_macro]
+    fn foo() {
+        println!("Hello, world!");
+    }
+
+    #[derive(Debug)]
+    struct Bar;
 }

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MacroRules x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  MacroRules x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasName, string hasTokenTree, string hasVisibility
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasName, string hasTokenTree,
+  string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,11 +15,15 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasTokenTree:", hasTokenTree, "hasVisibility:", hasVisibility
+  "hasName:", hasName, "hasTokenTree:", hasTokenTree, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from MacroRules x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | mod foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| gen_module.rs:3:1:4:8 | mod foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
-| gen_module.rs:5:1:7:1 | mod bar | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
+| gen_module.rs:5:1:7:1 | mod bar | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
-| lib.rs:1:1:1:15 | mod gen_module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| lib.rs:1:1:1:15 | mod gen_module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |

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

@@ -3,8 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Module x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Module x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasItemList, string hasName, string hasVisibility
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasItemList, string hasName,
+  string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,11 +15,15 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasItemList() then hasItemList = "yes" else hasItemList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasItemList:", hasItemList,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasName:", hasName, "hasVisibility:", hasVisibility
+  "hasItemList:", hasItemList, "hasName:", hasName, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/Module/Module_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Module x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,9 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Static x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasBody, string isMut, string isStatic, string isUnsafe,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasBody, string isMut,
-  string hasName, string hasTypeRepr, string hasVisibility
+  string isStatic, string isUnsafe, string hasName, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
@@ -25,6 +29,6 @@ where
   (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  isMut, "isStatic:", isStatic, "isUnsafe:", isUnsafe, "hasName:", hasName, "hasTypeRepr:",
+  "hasBody:", hasBody, "isMut:", isMut, "isStatic:", isStatic, "isUnsafe:", isUnsafe, "hasName:",
-  hasTypeRepr, "hasVisibility:", hasVisibility
+  hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/Static/Static_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Static x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,9 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Struct x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Struct x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasFieldList, string hasGenericParamList, string hasName,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasFieldList,
-  string hasVisibility, string hasWhereClause
+  string hasGenericParamList, string hasName, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
@@ -23,6 +27,6 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasFieldList:", hasFieldList,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVisibility:", hasVisibility,
+  "hasFieldList:", hasFieldList, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName,
-  "hasWhereClause:", hasWhereClause
+  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Struct/Struct_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Struct x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
-| gen_trait.rs:10:1:10:57 | trait Foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasExpanded: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes |
+| gen_trait.rs:10:1:10:57 | trait Foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes |

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

@@ -3,10 +3,10 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Trait x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Trait x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isAuto,
+  string hasAttributeMacroExpansion, string hasAssocItemList, int getNumberOfAttrs,
-  string isUnsafe, string hasName, string hasTypeBoundList, string hasVisibility,
+  string hasGenericParamList, string isAuto, string isUnsafe, string hasName,
-  string hasWhereClause
+  string hasTypeBoundList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -16,7 +16,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
@@ -27,7 +31,7 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasAssocItemList:", hasAssocItemList,
-  getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isAuto:", isAuto, "isUnsafe:",
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isAuto:",
-  isUnsafe, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:",
+  isAuto, "isUnsafe:", isUnsafe, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList,
-  hasVisibility, "hasWhereClause:", hasWhereClause
+  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Trait/Trait_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Trait x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,9 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  TraitAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  TraitAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasTypeBoundList,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasGenericParamList,
-  string hasVisibility, string hasWhereClause
+  string hasName, string hasTypeBoundList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
@@ -23,6 +27,6 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  hasGenericParamList, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:",
+  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasTypeBoundList:",
-  hasVisibility, "hasWhereClause:", hasWhereClause
+  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from TraitAlias x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -1,2 +1,2 @@
-| gen_type_alias.rs:4:5:5:26 | type Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasExpanded: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_type_alias.rs:4:5:5:26 | type Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
-| gen_type_alias.rs:8:9:8:20 | type Output | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasExpanded: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | no | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_type_alias.rs:8:9:8:20 | type Output | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | no | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |

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

@@ -3,9 +3,10 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasGenericParamList, string isDefault, string hasName,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasGenericParamList,
-  string hasTypeRepr, string hasTypeBoundList, string hasVisibility, string hasWhereClause
+  string isDefault, string hasName, string hasTypeRepr, string hasTypeBoundList,
+  string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +16,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
@@ -25,7 +30,7 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  hasGenericParamList, "isDefault:", isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr,
+  "hasGenericParamList:", hasGenericParamList, "isDefault:", isDefault, "hasName:", hasName,
-  "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:",
+  "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:",
-  hasWhereClause
+  hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeAlias x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,9 +3,9 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Union x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Union x, string hasExtendedCanonicalPath, string hasCrateOrigin,
-  int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasStructFieldList,
+  string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasGenericParamList,
-  string hasVisibility, string hasWhereClause
+  string hasName, string hasStructFieldList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,7 +15,11 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
@@ -23,6 +27,6 @@ where
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:",
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  hasGenericParamList, "hasName:", hasName, "hasStructFieldList:", hasStructFieldList,
+  "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasStructFieldList:",
-  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  hasStructFieldList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause

rust/ql/test/extractor-tests/generated/Union/Union_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Union x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

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

@@ -3,7 +3,7 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Use x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasExpanded,
+  Use x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAttributeMacroExpansion,
   int getNumberOfAttrs, string hasUseTree, string hasVisibility
 where
   toBeTested(x) and
@@ -14,10 +14,14 @@ where
     else hasExtendedCanonicalPath = "no"
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
-  (if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no") and
+  (
+    if x.hasAttributeMacroExpansion()
+    then hasAttributeMacroExpansion = "yes"
+    else hasAttributeMacroExpansion = "no"
+  ) and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasUseTree() then hasUseTree = "yes" else hasUseTree = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasExpanded:", hasExpanded, "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", hasUseTree,
+  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasVisibility:", hasVisibility
+  "hasUseTree:", hasUseTree, "hasVisibility:", hasVisibility

rust/ql/test/extractor-tests/generated/Use/Use_getAttributeMacroExpansion.ql

@@ -4,4 +4,4 @@ import TestUtils
 
 from Use x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpanded()
+select x, x.getAttributeMacroExpansion()

rust/ql/test/extractor-tests/macro_expansion/test.expected

@@ -0,0 +1,2 @@
+| macro_expansion.rs:1:1:2:11 | fn foo | 0 | macro_expansion.rs:2:4:2:10 | fn foo |
+| macro_expansion.rs:1:1:2:11 | fn foo | 1 | macro_expansion.rs:2:4:2:6 | Static |

rust/ql/test/extractor-tests/macro_expansion/test.ql

@@ -0,0 +1,6 @@
+import rust
+import TestUtils
+
+from Item i, MacroItems items, int index, Item expanded
+where toBeTested(i) and i.getAttributeMacroExpansion() = items and items.getItem(index) = expanded
+select i, index, expanded

rust/schema/annotations.py

@@ -1164,7 +1164,7 @@ class _:
     """
 
 
-@annotate(Item)
+@annotate(Item, add_bases=(Addressable,))
 class _:
     """
     A Item. For example:
@@ -1172,6 +1172,7 @@ class _:
     todo!()
     ```
     """
+    attribute_macro_expansion: optional[MacroItems] | child | rust.detach
 
 
 @annotate(ItemList)
@@ -1232,6 +1233,7 @@ class _:
     todo!()
     ```
     """
+    macro_call_expansion: optional[AstNode] | child | rust.detach
 
 
 @annotate(MacroDef)
@@ -1258,10 +1260,18 @@ class _:
 @rust.doc_test_signature(None)
 class _:
     """
-    A sequence of items generated by a `MacroCall`. For example:
+    A sequence of items generated by a macro. For example:
     ```rust
     mod foo{
         include!("common_definitions.rs");
+
+        #[an_attribute_macro]
+        fn foo() {
+            println!("Hello, world!");
+        }
+
+        #[derive(Debug)]
+        struct Bar;
     }
     ```
     """
@@ -1940,8 +1950,3 @@ class FormatArgument(Locatable):
     """
     parent: Format
     variable: optional[FormatTemplateVariableAccess] | child
-
-
-@annotate(Item, add_bases=(Addressable,))
-class _:
-    expanded: optional[AstNode] | child | rust.detach | doc("expanded attribute or procedural macro call of this item")