Rust: run codegen

2026-04-27 17:55:19 +02:00 · 2025-06-04 11:12:48 +02:00
parent 7a13c981b8
commit e87878298e
40 changed files with 72 additions and 83 deletions
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 5a615bdde6f762f7c2e5f656aa1e57c74ada74f395e55114813b814358f5f395 864c33513287252507829e258bface3d53e1aa4398e841ce1c81c803dc7ba3f5
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll bd01b4d17625ee8c0da93231cf2291deb7e57db2c8aaa2c37968553c3144c47e 6e6ac58e09b84d02f461699a25ee80798a1bdc51c1836d9d75f5b52e93ae7ba6
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 3d2f6f5542340b80a4c6e944ac17aba0d00727588bb66e501453ac0f80c82f83 afd52700bf5a337f19827846667cd0fb1fea5abbbcbc353828e292a727ea58c9
@@ -57,7 +57,7 @@ lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204
 lib/codeql/rust/elements/FieldList.qll 72f3eace2f0c0600b1ad059819ae756f1feccd15562e0449a3f039a680365462 50e4c01df7b801613688b06bb47ccc36e6c8c7fa2e50cc62cb4705c9abf5ee31
 lib/codeql/rust/elements/FnPtrTypeRepr.qll d4586ac5ee2382b5ef9daafa77c7b3c1b7564647aa20d1efb1626299cde87ba9 48d9b63725c9cd89d79f9806fa5d5f22d7815e70bbd78d8da40a2359ac53fef5
 lib/codeql/rust/elements/ForExpr.qll a050f60cf6fcc3ce66f5042be1b8096e5207fe2674d7477f9e299091ca99a4bd d7198495139649778894e930163add2d16b5588dd12bd6e094a9aec6863cb16f
-lib/codeql/rust/elements/ForTypeRepr.qll adb2b10f10b66b868d26b7418f06707cf5b2a44d7fabfe2570a9223a8d6027eb 1d2a57ba94c3adb76bbd8d941700b6228983933eb3e0f29f0c2c1650c077351e
+lib/codeql/rust/elements/ForTypeRepr.qll b3ba3a7f74f092397f7986542e59020bd7ea63eb8abc154d0f66f1415e1eaf6e a04750567cf85e11698a6b93674a651245537d08bf8aabf303a3626e190a4977
 lib/codeql/rust/elements/Format.qll 1b186730710e7e29ea47594998f0b359ad308927f84841adae0c0cb35fc8aeda d6f7bfdda60a529fb9e9a1975628d5bd11aa28a45e295c7526692ac662fd19f8
 lib/codeql/rust/elements/FormatArgsArg.qll a2c23cd512d44dd60b7d65eba52cc3adf6e2fbbcd0588be375daa16002cd7741 d9c5fe183fb228375223d83f857b7a9ee686f1d3e341bcf323d7c6f39652f88b
 lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
@@ -90,7 +90,7 @@ lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f
 lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
 lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
 lib/codeql/rust/elements/MacroBlockExpr.qll fb81f067a142053b122e2875a15719565024cfb09326faf12e0f1017307deb58 3ee94ef7e56bd07a8f9304869b0a7b69971b02abbee46d0bebcacb4031760282
-lib/codeql/rust/elements/MacroCall.qll 92fb19e7796d9cc90841150162ce17248e321cfc9e0709c42b7d3aef58cde842 7c0bb0e51762d6c311a1b3bb5358e9d710b1cf50cff4707711f55f564f640318
+lib/codeql/rust/elements/MacroCall.qll 7e456de5b506ea6d4ca20a55f75734ede9202f31529c111df3ed3eab1a9b83e5 cc0f45aaeaab4d32ad133c18ad8000316cbcfa62062bd31b6a0e690df7bb76bc
 lib/codeql/rust/elements/MacroDef.qll 5bcf2bba7ba40879fe47370bfeb65b23c67c463be20535327467338a1e2e04bb c3d28416fc08e5d79149fccd388fea2bc3097bce074468a323383056404926db
 lib/codeql/rust/elements/MacroExpr.qll 640554f4964def19936a16ce88a03fb12f74ec2bcfe38b88d32742b79f85d909 a284fb66e012664a33a4e9c8fd3e38d3ffd588fccd6b16b02270da55fc025f7a
 lib/codeql/rust/elements/MacroItems.qll f2d80ff23634ac6bc3e96e8d73154587f9d24edb56654b5c0ae426124d2709ea f794f751b77fc50d7cc3069c93c22dd3a479182edce15c1b22c8da31d2e30a12
@@ -106,14 +106,14 @@ lib/codeql/rust/elements/MethodCallExpr.qll 318a46ba61e3e4f0d6ce0e8fa9f79ccbbf2d
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll af41479d4260fe931d46154dda15484e4733c952b98f0e370106e6e9e8ce398b e188a0d0309dd1b684c0cb88df435b38e306eb94d6b66a2b748e75252f15e095
-lib/codeql/rust/elements/NameRef.qll 9a00b24781102c6998eaf374602a188f61d9ff2a542771e461b3d4d88f5432c7 0a381eb986408858b5e8b6b6f27ec3e84a1547e8df5ab92a080be873e5700401
+lib/codeql/rust/elements/NameRef.qll 587308f2276853303fd5e8804fad255e200fdbb115c4abf7635435856884e254 6cb64e921d2dde8fc87cb26b6539254b883a7313689798180791a2905eb3f418
 lib/codeql/rust/elements/NeverTypeRepr.qll e523e284b9becb3d55e2f322f4497428bfa307c904745878545695a73d7e3a52 4af09ebae3348ba581b59f1b5fa4c45defc8fa785622719fa98ebefee2396367
 lib/codeql/rust/elements/OffsetOfExpr.qll 370734a01c72364c9d6a904597190dac99dc1262631229732c8687fd1b3e2aa0 e222d2688aa18ed6eec04f2f6ac1537f5c7467d2cef878122e8fc158d4f6f99e
 lib/codeql/rust/elements/OrPat.qll 408b71f51edbfc79bf93b86fb058d01fa79caf2ebfeef37b50ae1da886c71b68 4a3f2b00db33fe26ee0859e35261016312cb491e23c46746cdd6d8bb1f6c88ef
 lib/codeql/rust/elements/Param.qll d0c0a427c003bbbacaeb0c2f4566f35b997ad0bca4d49f97b50c3a4bd1ddbd71 e654a17dfcb7aaeb589e7944c38f591c4cf922ebceb834071bcb9f9165ee48be
 lib/codeql/rust/elements/ParamBase.qll 6fe595b1bebd4a760e17fb364e5aa77505cc57b9bda89c21abdad1ce9e496419 f03316c25d38ecc56c16d7d36358144072159f6ab176315293c7bf3b45b35fff
 lib/codeql/rust/elements/ParamList.qll 08cba1bf455e333e5a96a321cd48e7e7276406912ec0589bf20d09cf54ede390 fb3777b5a19e18ef0f5c90b246b61ac94568db2dd8e3c44fbe6b4b8cc15cc0cf
-lib/codeql/rust/elements/ParenExpr.qll fd45adfd03ddc33cdcf4b0ac098f12b7f34957d3ee6441b2d7a3e4c3218efa85 0822656ac05554ca19c9eedeaf06a97569a2f4912e1f920f321681b8e84ebcfd
+lib/codeql/rust/elements/ParenExpr.qll 3cd9ecbb466188a2644411582686ec67f4aab42472adfdb155918a9c7ea5aca9 8a9264065e0b52afab1121f212a8c75458635f07b2a7eb28202d5668b67cd865
 lib/codeql/rust/elements/ParenPat.qll 9359011e3fdf6a40396625c361f644e8c91f4d52570097e813817ed53196808e 34ed1a87043b25da439d6c9973f8b5461f4f6c11d233f8753ff76157628c66b8
 lib/codeql/rust/elements/ParenTypeRepr.qll 2388b6c663b2d02c834592c5da5cafac71baa55d4a0eaaca341e13f52dd0e14d 029454c18859a639c4b87825932e5dfe8026cec6ab87adaa4a0d464149e51b07
 lib/codeql/rust/elements/ParenthesizedArgList.qll aa3be48d2f8b5cec56db3866fb7d4e0cd97787e9123e2d947912eb8155bf372b 32790971728c9ae2f3d59155d46283aaf4f08238e47bb028a1f20a6d3a734b98
@@ -145,7 +145,7 @@ lib/codeql/rust/elements/SourceFile.qll 0b6a3e58767c07602b19975009a2ad53ecf1fd72
 lib/codeql/rust/elements/Static.qll a6d73152ddecb53a127aa3a4139f97007cd77b46203691c287600aa7200b8beb 547197e794803b3ea0c0e220f050980adec815a16fdef600f98ff795aa77f677
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
 lib/codeql/rust/elements/StmtList.qll e874859ce03672d0085e47e0ca5e571b92b539b31bf0d5a8802f9727bef0c6b0 e5fe83237f713cdb57c446a6e1c20f645c2f49d9f5ef2c984032df83acb3c0de
-lib/codeql/rust/elements/Struct.qll b647e20c62458fd3fd3a2437cd544e65922d9853dd6d725dec324739d7342368 869b81a7965d320805bce9638a8d8cf0789dfefdcceafacc0b84c7ee9ae44058
+lib/codeql/rust/elements/Struct.qll c1f607aa4b039fc24bbbedc5992e49bd13e9851731296645c7ec2669425f19ad d7720c76a5a50284bd62df707cb113dfb19104226e9ee7578e75eb207da0655c
 lib/codeql/rust/elements/StructExpr.qll af9059c01a97755e94f1a8b60c66d9c7663ed0705b2845b086b8953f16019fab 2d33d86b035a15c1b31c3e07e0e74c4bbe57a71c5a55d60e720827814e73b7ba
 lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
 lib/codeql/rust/elements/StructExprFieldList.qll 6efb2ec4889b38556dc679bb89bbd4bd76ed6a60014c41f8e232288fc23b2d52 dc867a0a4710621e04b36bbec7d317d6f360e0d6ac68b79168c8b714babde31d
@@ -155,7 +155,7 @@ lib/codeql/rust/elements/StructPat.qll cdd1e8417d1c8cb3d14356390d71eb2916a295d95
 lib/codeql/rust/elements/StructPatField.qll 856aa7d7c6d9b3c17514cbd12a36164e6e9d5923245770d0af3afb759a15204a 1bd1a294d84ad5e4da24e03b4882b215c50473875014859dbf26555d1f4ec2d5
 lib/codeql/rust/elements/StructPatFieldList.qll 44619afedcda047e51ee3e319f738d5c49ff5e3f8811155a3ef9874d12bc091d 6b4412a5b0f3ebc0a9f228129c1727b1d6a1947fc826e62fa8e34b2c7d3864ed
 lib/codeql/rust/elements/Token.qll e2de97c32e12c7ac9369f8dccabc22d89bfcbf7f6acd99f1aa7faa38eb4ac2b2 888d7e1743e802790e78bae694fedb4aba361b600fb9d9ecf022436f2138e13c
-lib/codeql/rust/elements/TokenTree.qll 3211381711dbff2684f8a32299f716e29db2fe7f2384e307f7f416eb19885ab3 d72db24f99ac31c5ff4870a61e49407988b2ec17041f0cb04ada3c8afc404e72
+lib/codeql/rust/elements/TokenTree.qll 23e57fd945ce509df5122aa46f7971360788945cb7a67ddc229de5f44b80e6e9 18a7834edf5d6808e9126c0ce2e9554211faaf21bf7e9e2fa09aa167654e43a9
 lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
 lib/codeql/rust/elements/TraitAlias.qll 1d82d043f24dbac04baa7aa3882c6884b8ffbc5d9b97669ce8efb7e2c8d3d2c8 505ba5426e87b3c49721f440fbc9ad6b0e7d89d1b1a51ca3fa3a6cc2d36f8b82
 lib/codeql/rust/elements/TryExpr.qll cb452f53292a1396139f64a35f05bb11501f6b363f8affc9f2d5f1945ad4a647 d60ad731bfe256d0f0b688bdc31708759a3d990c11dee4f1d85ccc0d9e07bec9
@@ -178,12 +178,12 @@ lib/codeql/rust/elements/Union.qll f035871f9d265a002f8a4535da11d6191f04337c1d22d
 lib/codeql/rust/elements/Use.qll fdcf70574403c2f219353211b6930f2f9bc79f41c2594e07548de5a8c6cbb24d e41f2b689fcbeb7b84c7ba8d09592f7561626559318642b73574bbac83f74546
 lib/codeql/rust/elements/UseBoundGenericArg.qll f16903f8fff676d3700eaad5490804624391141472ecc3166ccb1f70c794c120 5efda98088d096b42f53ceccae78c05f15c6953525b514d849681cb2cf65b147
 lib/codeql/rust/elements/UseBoundGenericArgs.qll d9821a82a1d57e609fdc5e79d65e9a88b0088f51d03927e09f41b6931d3484ab 181483a95e22622c7cee07cce87e9476053f824a82e67e2bdecabf5a39f672ad
-lib/codeql/rust/elements/UseTree.qll c96d9eeba6947e386e1011cbb1596faf67b93d5fe60c6d40e6f1b4e8d2ddc7c4 138270726a149137a82cf21e5e311cd73ce07e7606bb59b8fa0ad02c4fe3d8b4
-lib/codeql/rust/elements/UseTreeList.qll 2c5ff6a35f90688de0477fb4fda16319926def1232d83242db287f48079d903c 4ae4a85f1d77be44c1d7e3b02eec4c35753f5e75370a6f48da83e2fccdef32ae
+lib/codeql/rust/elements/UseTree.qll e67c148f63668319c37914a46ff600692de477242a0129fa1bb9839754c0f830 de9b39d3d078d51ec9130db6579bff13e6297e60556a7214a5c51cbf89d92791
+lib/codeql/rust/elements/UseTreeList.qll 92ebfee4392a485b38fb3265fdede7c8f2ed1dbe2ab860aa61b1497c33874d25 a4e677455d20838e422e430eebd73d0a488e34e8c960f375fef7b99e79d4c911
 lib/codeql/rust/elements/Variant.qll 9377fa841779e8283df08432bf868faf161c36cc03f332c52ae219422cb9f959 2440771a5a1ef28927fe6fdc81b0e95c91aae18911739c89753fbadce7ff6cc9
 lib/codeql/rust/elements/VariantDef.qll fb14bf049aba1fc0b62d156e69b7965b6526d12c9150793f1d38b0f8fb8a0a8f 71453a80a3c60288242c5d86ab81ef4d027a3bc870ceffa62160864d32a7d7ad
 lib/codeql/rust/elements/VariantList.qll 39803fbb873d48202c2a511c00c8eafede06e519894e0fd050c2a85bf5f4aa73 1735f89b2b8f6d5960a276b87ea10e4bb8c848c24a5d5fad7f3add7a4d94b7da
-lib/codeql/rust/elements/Visibility.qll 7af2cbe062880fd0296dadc8ab4e62133371fe1e67faed9474792283420e4dbc 69f40d71402065eae4989611d5e7f747282657d921687a25bc4cfaf507381fcb
+lib/codeql/rust/elements/Visibility.qll aa69e8a3fd3b01f6fea0ae2d841a2adc51f4e46dcfc9f8f03c34fbe96f7e24e7 0d475e97e07b73c8da2b53555085b8309d8dc69c113bcb396fc901361dbfe6b8
 lib/codeql/rust/elements/WhereClause.qll 4e28e11ceec835a093e469854a4b615e698309cdcbc39ed83810e2e4e7c5953f 4736baf689b87dd6669cb0ef9e27eb2c0f2776ce7f29d7693670bbcea06eb4e4
 lib/codeql/rust/elements/WherePred.qll 490395b468c87d5c623f6741dc28512ee371cbf479ea77aee7e61b20544f5732 782f74b101d374a71908069be3db23755ab1473ffe879b368be73a5fdc6eac3a
 lib/codeql/rust/elements/WhileExpr.qll 4a37e3ecd37c306a9b93b610a0e45e18adc22fcd4ce955a519b679e9f89b97e8 82026faa73b94390544e61ed2f3aaeaabd3e457439bb76d2fb06b0d1edd63f49
@@ -277,7 +277,7 @@ lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll 61d8808ea027a6e04
 lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll 6b66f9bda1b5deba50a02b6ac7deb8e922da04cf19d6ed9834141bc97074bf14 b0a07d7b9204256a85188fda2deaf14e18d24e8a881727fd6e5b571bf9debdc8
 lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
 lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll eae141dbe9256ab0eb812a926ebf226075d150f6506dfecb56c85eb169cdc76b 721c2272193a6f9504fb780d40e316a93247ebfb1f302bb0a0222af689300245
-lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 6028b20d0a968625baaa8a5c42871b821d8e1b81ee92997cf68bd738162ee2d5 66aa462b154ab15fe559d45702a2b7c8038b704438d2016696c2eded6ce6a56b
+lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 75747779312b3f3ffdd02188053ba3f46b8922f02630711902f7a27eecced31a 71a900f014758d1473ef198c71892d42e20dd96e934d4bedb74581964c4d1503
 lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
 lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 6a8f55e51e141e4875ed03a7cc65eea49daa349de370b957e1e8c6bc4478425c 7efab8981ccbe75a4843315404674793dda66dde02ba432edbca25c7d355778a
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
@@ -405,7 +405,7 @@ lib/codeql/rust/elements/internal/StructPatFieldListConstructor.qll f67090a3738f
 lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll 046464430ba9cc0a924bb1370b584650c29b6abdaf0da73faa87cf7ec85cf959 84d236a133a016fbd373dbbc1aa70741f5ea67b3ea678adfac2625bc714419af
 lib/codeql/rust/elements/internal/TokenImpl.qll 87629ffee74cacc6e8af5e96e18e62fb0fa4043d3ba1e7360daa880e628f8530 d54e213e39ae2b9bb92ab377dc72d72ba5bca88b72d29032507cdcbef201a215
 lib/codeql/rust/elements/internal/TokenTreeConstructor.qll 0be1f838b04ff944560aa477cbe4ab1ad0b3f4ae982de84773faac5902fcae45 254b387adc2e1e3c355651ab958785d0b8babbc0030194234698a1219e9497b3
-lib/codeql/rust/elements/internal/TokenTreeImpl.qll e1e7639ae73516571b5715b0f1598c9ae4be73be7622f518e3185819a5daebe1 ded792db87b476148d7f3abdd7e2a0ed50c1ba70f848968fe587a4f398dfe24f
+lib/codeql/rust/elements/internal/TokenTreeImpl.qll 7c16b22a8ff4ad33be25c3d2d43b8f043cab7626538ac5d8938b074dc663b4f4 793e04299d571a8cea2097e6c43136c5e618b31da91ccc68bda334c3d2c3793d
 lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
 lib/codeql/rust/elements/internal/TraitAliasImpl.qll 434cf074a461219ad01ab2f116681213302fc62dabc4131d118b3bc2f2fd1af4 59e6f8893431e563897304e6f22da466c69410cf59206b634b426e8fef93b159
 lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
@@ -441,13 +441,13 @@ lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll f5c082fc8f7d9acc37
 lib/codeql/rust/elements/internal/UseConstructor.qll a4f790795e18abc29a50d6fbaa0db64cba781e3259a42cbf0468c24ac66b63e7 2fa288f073ac094a838c11f091def2c790b347b6a1b79407c11b10c73d6bff57
 lib/codeql/rust/elements/internal/UseTreeConstructor.qll 3e6e834100fcc7249f8a20f8bd9debe09b705fcf5a0e655537e71ac1c6f7956b cdbc84b8f1b009be1e4a7aaba7f5237823cea62c86b38f1794aad97e3dfcf64b
 lib/codeql/rust/elements/internal/UseTreeListConstructor.qll 973577da5d7b58eb245f108bd1ae2fecc5645f2795421dedf7687b067a233003 f41e5e3ffcb2a387e5c37f56c0b271e8dc20428b6ff4c63e1ee42fcfa4e67d0a
-lib/codeql/rust/elements/internal/UseTreeListImpl.qll 2ce4e524136f497ca3f13ea717ee1edc3acf894d696534debacab66d20429a4f 914e9542ef48cc54dd39733e58501a685a0ed06ecaf571e6c6756289bc0d1ecb
+lib/codeql/rust/elements/internal/UseTreeListImpl.qll a155fbfeb9792d511e1f3331d6756ccff6cca18c7ca4cac0faa7184cbb2e0dd4 0eeb1343b2284c02f9a0f0237267c77857a3a3a0f57df8277437313fde38d1b7
 lib/codeql/rust/elements/internal/VariantConstructor.qll 0297d4a9a9b32448d6d6063d308c8d0e7a067d028b9ec97de10a1d659ee2cfdd 6a4bee28b340e97d06b262120fd39ab21717233a5bcc142ba542cb1b456eb952
 lib/codeql/rust/elements/internal/VariantDefImpl.qll 5530c04b8906d2947ec9c79fc17a05a2557b01a521dd4ca8a60518b78d13867b 3971558e1c907d8d2ef174b10f911e61b898916055a8173788e6f0b98869b144
 lib/codeql/rust/elements/internal/VariantListConstructor.qll c841fb345eb46ea3978a0ed7a689f8955efc9178044b140b74d98a6bcd0c926a c9e52d112abdba2b60013fa01a944c8770766bf7368f9878e6b13daaa4eed446
 lib/codeql/rust/elements/internal/VariantListImpl.qll 4ceeda617696eb547c707589ba26103cf4c5c3d889955531be24cbf224e79dff 4258196c126fd2fad0e18068cb3d570a67034a8b26e2f13f8223d7f1a246d1a4
 lib/codeql/rust/elements/internal/VisibilityConstructor.qll 1fd30663d87945f08d15cfaca54f586a658f26b7a98ea45ac73a35d36d4f65d0 6ddaf11742cc8fbbe03af2aa578394041ae077911e62d2fa6c885ae0543ba53a
-lib/codeql/rust/elements/internal/VisibilityImpl.qll 855807bf38efae4c8d861a8f2a9b021bc13b6a99f8c7464595a8a07d2e6e1e10 029d99c954a4909539ca75fda815af39edc454900da6b9a897f0065f83dcbfb6
+lib/codeql/rust/elements/internal/VisibilityImpl.qll 85c1e75d6a7f9246cfef5c261e2aea40891c016724de49b3d6632623ccc30dcf 278be4648a8aefb0d926480c4d98e1605196ad64d1e4dbad42aa58499e6d485d
 lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
 lib/codeql/rust/elements/internal/WhereClauseImpl.qll 006e330df395183d15896e5f81128e24b8274d849fe45afb5040444e4b764226 ed5e8317b5f33104e5c322588dc400755c8852bbb77ef835177b13af7480fd43
 lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
@@ -518,7 +518,7 @@ lib/codeql/rust/elements/internal/generated/FieldExpr.qll d6077fcc563702bb8d626d
 lib/codeql/rust/elements/internal/generated/FieldList.qll 35bb72a673c02afafc1f6128aeb26853d3a1cdbaea246332affa17a023ece70e b7012dd214788de9248e9ab6eea1a896329d5731fa0b39e23df1b39df2b7eb9c
 lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll f218fa57a01ecc39b58fa15893d6499c15ff8ab8fd9f4ed3078f0ca8b3f15c7e 2d1a7325cf2bd0174ce6fc15e0cbe39c7c1d8b40db5f91e5329acb339a1ad1e8
 lib/codeql/rust/elements/internal/generated/ForExpr.qll 7c497d2c612fd175069037d6d7ff9339e8aec63259757bb56269e9ca8b0114ea dc48c0ad3945868d6bd5e41ca34a41f8ee74d8ba0adc62b440256f59c7f21096
-lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll a53e84660c07f3098b47e2b2e8eca58dd724895672820b67e461f8dc8e9ab4c5 56637f78cdaf9ff38d2508aa436e2bdcf5d2b4ee7e7b227e55889c6edb5186f2
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 36ea243bd5ada10c586d9430464761849506b91754cf045c59f4ae194e78a456 cc65dc72c87d0ad7be3263bbdd1c515a057e62e97b0a28f9c4b0f689ac3566b7
 lib/codeql/rust/elements/internal/generated/Format.qll 934351f8a8ffd914cc3fd88aca8e81bf646236fe34d15e0df7aeeb0b942b203f da9f146e6f52bafd67dcfd3b916692cf8f66031e0b1d5d17fc8dda5eefb99ca0
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll c762a4af8609472e285dd1b1aec8251421aec49f8d0e5ce9df2cc5e2722326f8 c8c226b94b32447634b445c62bd9af7e11b93a706f8fa35d2de4fda3ce951926
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
@@ -551,7 +551,7 @@ lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
 lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 778376cdfa4caaa9df0b9c21bda5ff0f1037b730aa43efb9fb0a08998ef3999b 6df39efe7823ce590ef6f4bdfa60957ba067205a77d94ac089b2c6a7f6b7b561
-lib/codeql/rust/elements/internal/generated/MacroCall.qll 743edec5fcb8f0f8aac9e4af89b53a6aa38029de23e17f20c99bee55e6c31563 4700d9d84ec87b64fe0b5d342995dbb714892d0a611802ba402340b98da17e4b
+lib/codeql/rust/elements/internal/generated/MacroCall.qll 74501c9687d6f216091d8cd3033613cd5f5c4aedbf75b594a2e2d1e438a74445 1de4d8bec211a7b1b12ff21505e17a4c381ccfa8f775049e2a6c8b3616efa993
 lib/codeql/rust/elements/internal/generated/MacroDef.qll 90393408d9e10ff6167789367c30f9bfe1d3e8ac3b83871c6cb30a8ae37eef47 f022d1df45bc9546cb9fd7059f20e16a3acfaae2053bbd10075fe467c96e2379
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 5a86ae36a28004ce5e7eb30addf763eef0f1c614466f4507a3935b0dab2c7ce3 11c15e8ebd36455ec9f6b7819134f6b22a15a3644678ca96b911ed0eb1181873
 lib/codeql/rust/elements/internal/generated/MacroItems.qll bf10b946e9addb8dd7cef032ebc4480492ab3f9625edbabe69f41dcb81d448fe f6788fe1022e1d699056111d47e0f815eb1fa2826c3b6a6b43c0216d82d3904b
@@ -567,7 +567,7 @@ lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 816267f27f990d655
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll e6bd6240a051383a52b21ab539bc204ce7bcd51a1a4379e497dff008d4eef5b4 578a3b45e70f519d57b3e3a3450f6272716c849940daee49889717c7aaa85fc9
-lib/codeql/rust/elements/internal/generated/NameRef.qll 6d6c79dd2d20e643b6a35fdd1b54f221297953b6ea1c597c94524dfc19edbc4c 386c4f899c399d8a259f4a7d5bc01069db225ce48154290e5446c3d797440425
+lib/codeql/rust/elements/internal/generated/NameRef.qll 090c15ed6c44fc4f1a7236215f42e16921912d3030119ac22bc7ffe2dcdb4ba8 b61cc486e6764272c4e8377523bf043d0beae4926606dbcb48f8205c6a0b9a90
 lib/codeql/rust/elements/internal/generated/NamedCrate.qll e190dd742751ea2de914d0750c93fcad3100d3ebb4e3f47f6adc0a7fa3e7932c 755ead62328df8a4496dc4ad6fea7243ab6144138ed62d7368fa53737eef5819
 lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll 4f13c6e850814a4759fdb5fca83a50e4094c27edee4d2e74fe209b10d8fb01c3 231f39610e56f68f48c70ca8a17a6f447458e83218e529fff147ed039516a2f7
 lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll c86eecd11345a807571542e220ced8ccc8bb78f81de61fff6fc6b23ff379cd12 76a692d3ad5e26751e574c7d9b13cf698d471e1783f53a312e808c0b21a110ab
@@ -575,7 +575,7 @@ lib/codeql/rust/elements/internal/generated/OrPat.qll 0dc6bd6ada8d11b7f708f71c82
 lib/codeql/rust/elements/internal/generated/Param.qll 19f03396897c1b7b494df2d0e9677c1a2fc6d4ae190e64e5be51145aba9de2e2 3d63116e70457226ea7488a9f6ed9c7cea3233b0e5cab443db9566c17b125e80
 lib/codeql/rust/elements/internal/generated/ParamBase.qll 218f3b821675c0851b93dd78946e6e1189a41995dc84d1f5c4ac7f82609740f7 4c281b4f5364dab23d176859e6b2196a4228a65549e9f63287fa832bd209e13d
 lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47ec556cc05c30a0666aece43163cf5847789389d05bf a08d09d0d3dfca6f3efade49687800bae7e6f01714ed0a151abd4885cd74a1b6
-lib/codeql/rust/elements/internal/generated/ParenExpr.qll be09d4059d093c6404541502c9ab2f7e2db6e906b1c50b5dee78607211c2f8d1 36a6b7992afa4103d4a544cb7cdd31b62e09fa0954c8a5f9d3746e3165eac572
+lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
 lib/codeql/rust/elements/internal/generated/ParentChild.qll e2c6aaaa1735113f160c0e178d682bff8e9ebc627632f73c0dd2d1f4f9d692a8 61cf70eb649f241e2fcd5e0ba34df63f3a14f07032811b9ae151721783a0fd20
@@ -593,7 +593,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf
 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 ea65a886bb8915a6c58ef6bf9900e457ad54df50cd16d901415267703047b6a8 bad7285d4604640cb3165fe25365d7325134d7ecf32953021d90dcff4763bcad
+lib/codeql/rust/elements/internal/generated/Raw.qll 55ec0031a67964805e9dfb8d3190385e101178d1bcce1c4efd53d8f58d1cf0be d34faae700e7c2cb9e6eb2183244ff900a270c761676491d3ffe6a939903edd7
 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 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
@@ -610,7 +610,7 @@ lib/codeql/rust/elements/internal/generated/SourceFile.qll 4bc95c88b49868d1da1a8
 lib/codeql/rust/elements/internal/generated/Static.qll 34a4cdb9f4a93414499a30aeeaad1b3388f2341c982af5688815c3b0a0e9c57b 3c8354336eff68d580b804600df9abf49ee5ee10ec076722089087820cefe731
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll 816aebf8f56e179f5f0ba03e80d257ee85459ea757392356a0af6dbd0cd9ef5e 6aa51cdcdc8d93427555fa93f0e84afdfbbd4ffc8b8d378ae4a22b5b6f94f48b
-lib/codeql/rust/elements/internal/generated/Struct.qll a84ffac73686806abe36ba1d3ba5ada479813e8c2cb89b9ac50889b4fa14e0a5 0c27cc91de44878f45f516ec1524e085e6a0cc94809b4c7d1b4ef3db2967341e
+lib/codeql/rust/elements/internal/generated/Struct.qll 955c7e1e6453685fbc392e32514cf26a9aec948cecf9e62705ddc5c56c9dc97d cf47a9c53eebc0c7165985cd6120530b8a0fe965895d2293d01f7b95013c0102
 lib/codeql/rust/elements/internal/generated/StructExpr.qll c6d861eaa0123b103fd9ffd2485423419ef9b7e0b4af9ed2a2090d8ec534f65d 50da99ee44771e1239ed8919f711991dd3ec98589fbe49b49b68c88074a07d74
 lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
 lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 298d33442d1054922d2f97133a436ee559f1f35b7708523284d1f7eee7ebf443 7febe38a79fadf3dcb53fb8f8caf4c2780f5df55a1f8336269c7b674d53c6272
@@ -622,7 +622,7 @@ lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll 1a95a1bd9f64f
 lib/codeql/rust/elements/internal/generated/Synth.qll eb248f4e57985ec8eabf9ed5cfb8ba8f5ebd6ca17fb712c992811bced0e342d4 bbcbdba484d3b977a0d6b9158c5fa506f59ced2ad3ae8239d536bf826bfb7e31
 lib/codeql/rust/elements/internal/generated/SynthConstructors.qll bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076 bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
-lib/codeql/rust/elements/internal/generated/TokenTree.qll a90ee34bfd9fa0e652ea293f2bc924a7b775698db2430f6c4ab94acce54bb4ca 3951509ad9c769eacc78a7ed978e91c6de79fc7d106206ebd0290b4a490ab4c5
+lib/codeql/rust/elements/internal/generated/TokenTree.qll 1a3c4f5f30659738641abdd28cb793dab3cfde484196b59656fc0a2767e53511 de2ebb210c7759ef7a6f7ee9f805e1cac879221287281775fc80ba34a5492edf
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 40a296cf89eceaf02a32db90acb42bdc90df10e717bae3ab95bc09d842360a5b af85cf1f8fa46a8b04b763cdcacc6643b83c074c58c1344e485157d2ceb26306
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 73052d7d309427a30019ad962ee332d22e7e48b9cc98ee60261ca2df2f433f93 d9dd70bf69eaa22475acd78bea504341e3574742a51ad9118566f39038a02d85
@@ -645,12 +645,12 @@ lib/codeql/rust/elements/internal/generated/Union.qll 0d5528d9331cc7599f0c7bc4d2
 lib/codeql/rust/elements/internal/generated/Use.qll cf95b5c4756b25bee74113207786e37464ffbc0fb5f776a04c651300afc53753 1fe26b3904db510184cb688cb0eeb0a8dbac7ac15e27a3b572d839743c738393
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll 69162794e871291545ea04f61259b2d000671a96f7ca129f7dd9ed6e984067c4 31de9ebc0634b38e2347e0608b4ea888892f1f2732a2892464078cd8a07b4ee8
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll 2cc8ab0068b7bf44ca17a62b32a8dd1d89cd743532c8a96b262b164fd81b0c36 347e7709a0f5ace197beb6827f6cf04a31ff68ff2dff3707914c6b910658d00a
-lib/codeql/rust/elements/internal/generated/UseTree.qll 4e9ee129b4d2007143321185dd3d0633afa8002778a4b908928ee415c6663d31 bf6d3403e483b1bd6ceb269c05d6460327f61dd9b28022f1d95f9e9c9b893c27
-lib/codeql/rust/elements/internal/generated/UseTreeList.qll 592187a0e131e92ebec9630b4043766511e6146ef1811762b4a65f7c48e2a591 331eeacf1fff6f4150adda197ed74cbf43ce1d19206105a6b7ee58875c8ef4f5
+lib/codeql/rust/elements/internal/generated/UseTree.qll 3d7cbcc8ae76068b8f660c7d5b81b05595026043015cd6b4d42a60ed4c165811 b9f0bcf82feb31f31406e787670fee93e1aa0966bcc0e4cc285c342e88793e4e
+lib/codeql/rust/elements/internal/generated/UseTreeList.qll 38efaa569b76ca79be047703279388e8f64583a126b98078fbbb6586e0c6eb56 1623a50fd2d3b1e4b85323ad73dd655172f7cbc658d3506aaa6b409e9ebe576e
 lib/codeql/rust/elements/internal/generated/Variant.qll 56ef12f3be672a467b443f8e121ba075551c88fe42dd1428e6fa7fc5affb6ec2 fd66722fd401a47305e0792458528a6af2437c97355a6a624727cf6632721a89
 lib/codeql/rust/elements/internal/generated/VariantDef.qll 3a579b21a13bdd6be8cddaa43a6aa0028a27c4e513caa003a6304e160fc53846 1ca1c41ed27660b17fbfb44b67aa8db087ea655f01bac29b57bb19fa259d07a2
 lib/codeql/rust/elements/internal/generated/VariantList.qll 3f70bfde982e5c5e8ee45da6ebe149286214f8d40377d5bc5e25df6ae8f3e2d1 22e5f428bf64fd3fd21c537bfa69a46089aad7c363d72c6566474fbe1d75859e
-lib/codeql/rust/elements/internal/generated/Visibility.qll d1e46025a2c36f782c3b4ec06ad6a474d39d192b77ebf0dfced178dc2ca439b6 61fc3276a394b4a201f7d59f5ddf24850612546ce4041c3204a80d3db3d99662
+lib/codeql/rust/elements/internal/generated/Visibility.qll af1069733c0120fae8610b3ebbcdcebe4b4c9ce4c3e3d9be3f82a93541873625 266106bdff4d7041d017871d755c011e7dd396c5999803d9e46725b6a03a2458
 lib/codeql/rust/elements/internal/generated/WhereClause.qll aec72d358689d99741c769b6e8e72b92c1458138c097ec2380e917aa68119ff0 81bb9d303bc0c8d2513dc7a2b8802ec15345b364e6c1e8b300f7860aac219c36
 lib/codeql/rust/elements/internal/generated/WherePred.qll 9aa63abdf1202ee4708e7413401811d481eac55ba576a4950653395f931d1e90 ebb9f2883f811ea101220eac13d02d2893d2ec0231a29826a32b77cb2c88a5f8
 lib/codeql/rust/elements/internal/generated/WhileExpr.qll 0353aab87c49569e1fbf5828b8f44457230edfa6b408fb5ec70e3d9b70f2e277 e1ba7c9c41ff150b9aaa43642c0714def4407850f2149232260c1a2672dd574a
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -1833,7 +1833,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
     * For example:
     * ```rust
     * println!("Hello, world!");
-     * //^^^^^^^
     * ```
     */
    final class MacroCallCfgNode extends CfgNodeFinal {
--- a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.TypeRepr

 /**
- * A higher-ranked trait bound(HRTB) type.
+ * A higher-ranked trait bound.
 *
 * For example:
 * ```rust
--- a/rust/ql/lib/codeql/rust/elements/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
@@ -18,7 +18,6 @@ import codeql.rust.elements.TokenTree
 * For example:
 * ```rust
 * println!("Hello, world!");
- * //^^^^^^^
 * ```
 */
 final class MacroCall = Impl::MacroCall;
--- a/rust/ql/lib/codeql/rust/elements/NameRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/NameRef.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.UseBoundGenericArg
 *
 * For example:
 * ```rust
- * foo();
+ *   foo();
 * //^^^
 * ```
 */
--- a/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
@@ -13,7 +13,6 @@ import codeql.rust.elements.Expr
 * For example:
 * ```rust
 * (x + y)
- * //^^^^^
 * ```
 */
 final class ParenExpr = Impl::ParenExpr;
--- a/rust/ql/lib/codeql/rust/elements/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/Struct.qll
@@ -17,7 +17,7 @@ import codeql.rust.elements.WhereClause
 * A Struct. For example:
 * ```rust
 * struct Point {
- * x: i32,
+ *     x: i32,
 *     y: i32,
 * }
 * ```
--- a/rust/ql/lib/codeql/rust/elements/TokenTree.qll
+++ b/rust/ql/lib/codeql/rust/elements/TokenTree.qll
@@ -14,9 +14,9 @@ import codeql.rust.elements.AstNode
 * println!("{} {}!", "Hello", "world");
 * //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 * ```
- * ```
+ * ```rust
 * macro_rules! foo { ($x:expr) => { $x + 1 }; }
- * //                 ^^^^^^^^^^^^^^^^^^^^^^^
+ * //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 * ```
 */
 final class TokenTree = Impl::TokenTree;
--- a/rust/ql/lib/codeql/rust/elements/UseTree.qll
+++ b/rust/ql/lib/codeql/rust/elements/UseTree.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.Rename
 import codeql.rust.elements.UseTreeList

 /**
- * A `use` tree, ie the part after the `use` keyword in a `use` statement. For example:
+ * A `use` tree, that is, the part after the `use` keyword in a `use` statement. For example:
 * ```rust
 * use std::collections::HashMap;
 * use std::collections::*;
--- a/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
+++ b/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
@@ -13,7 +13,7 @@ import codeql.rust.elements.UseTree
 * For example:
 * ```rust
 * use std::{fs, io};
- * //        ^^^^^^^
+ * //       ^^^^^^^^
 * ```
 */
 final class UseTreeList = Impl::UseTreeList;
--- a/rust/ql/lib/codeql/rust/elements/Visibility.qll
+++ b/rust/ql/lib/codeql/rust/elements/Visibility.qll
@@ -12,7 +12,7 @@ import codeql.rust.elements.Path
 *
 * For example:
 * ```rust
- * pub struct S;
+ *   pub struct S;
 * //^^^
 * ```
 */
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
@@ -13,7 +13,7 @@ private import codeql.rust.elements.internal.generated.ForTypeRepr
 */
 module Impl {
  /**
-   * A higher-ranked trait bound(HRTB) type.
+   * A higher-ranked trait bound.
   *
   * For example:
   * ```rust
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -27,7 +27,6 @@ module Impl {
   * For example:
   * ```rust
   * println!("Hello, world!");
-   * //^^^^^^^
   * ```
   */
  class MacroCall extends Generated::MacroCall {
--- a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
@@ -17,7 +17,7 @@ module Impl {
   *
   * For example:
   * ```rust
-   * foo();
+   *   foo();
   * //^^^
   * ```
   */
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -18,7 +18,6 @@ module Impl {
   * For example:
   * ```rust
   * (x + y)
-   * //^^^^^
   * ```
   */
  class ParenExpr extends Generated::ParenExpr {
--- a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -17,7 +17,7 @@ module Impl {
   * A Struct. For example:
   * ```rust
   * struct Point {
-   * x: i32,
+   *     x: i32,
   *     y: i32,
   * }
   * ```
--- a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
@@ -20,9 +20,9 @@ module Impl {
   * println!("{} {}!", "Hello", "world");
   * //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
-   * ```
+   * ```rust
   * macro_rules! foo { ($x:expr) => { $x + 1 }; }
-   * //                 ^^^^^^^^^^^^^^^^^^^^^^^
+   * //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
   */
  class TokenTree extends Generated::TokenTree { }
--- a/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
@@ -13,7 +13,7 @@ private import codeql.rust.elements.internal.generated.UseTree
 module Impl {
  // the following QLdoc is generated: if you need to edit it, do it in the schema file
  /**
-   * A `use` tree, ie the part after the `use` keyword in a `use` statement. For example:
+   * A `use` tree, that is, the part after the `use` keyword in a `use` statement. For example:
   * ```rust
   * use std::collections::HashMap;
   * use std::collections::*;
--- a/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
@@ -18,7 +18,7 @@ module Impl {
   * For example:
   * ```rust
   * use std::{fs, io};
-   * //        ^^^^^^^
+   * //       ^^^^^^^^
   * ```
   */
  class UseTreeList extends Generated::UseTreeList { }
--- a/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
@@ -17,7 +17,7 @@ module Impl {
   *
   * For example:
   * ```rust
-   * pub struct S;
+   *   pub struct S;
   * //^^^
   * ```
   */
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -16,7 +16,7 @@ import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 */
 module Generated {
  /**
-   * A higher-ranked trait bound(HRTB) type.
+   * A higher-ranked trait bound.
   *
   * For example:
   * ```rust
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
@@ -25,7 +25,6 @@ module Generated {
   * For example:
   * ```rust
   * println!("Hello, world!");
-   * //^^^^^^^
   * ```
   * INTERNAL: Do not reference the `Generated::MacroCall` class directly.
   * Use the subclass `MacroCall`, where the following predicates are available.
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
@@ -18,7 +18,7 @@ module Generated {
   *
   * For example:
   * ```rust
-   * foo();
+   *   foo();
   * //^^^
   * ```
   * INTERNAL: Do not reference the `Generated::NameRef` class directly.
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
@@ -21,7 +21,6 @@ module Generated {
   * For example:
   * ```rust
   * (x + y)
-   * //^^^^^
   * ```
   * INTERNAL: Do not reference the `Generated::ParenExpr` class directly.
   * Use the subclass `ParenExpr`, where the following predicates are available.
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -1184,9 +1184,9 @@ module Raw {
   * println!("{} {}!", "Hello", "world");
   * //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
-   * ```
+   * ```rust
   * macro_rules! foo { ($x:expr) => { $x + 1 }; }
-   * //                 ^^^^^^^^^^^^^^^^^^^^^^^
+   * //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
   */
  class TokenTree extends @token_tree, AstNode {
@@ -1319,7 +1319,7 @@ module Raw {

  /**
   * INTERNAL: Do not use.
-   * A `use` tree, ie the part after the `use` keyword in a `use` statement. For example:
+   * A `use` tree, that is, the part after the `use` keyword in a `use` statement. For example:
   * ```rust
   * use std::collections::HashMap;
   * use std::collections::*;
@@ -1358,7 +1358,7 @@ module Raw {
   * For example:
   * ```rust
   * use std::{fs, io};
-   * //        ^^^^^^^
+   * //       ^^^^^^^^
   * ```
   */
  class UseTreeList extends @use_tree_list, AstNode {
@@ -1400,7 +1400,7 @@ module Raw {
   *
   * For example:
   * ```rust
-   * pub struct S;
+   *   pub struct S;
   * //^^^
   * ```
   */
@@ -2252,7 +2252,7 @@ module Raw {

  /**
   * INTERNAL: Do not use.
-   * A higher-ranked trait bound(HRTB) type.
+   * A higher-ranked trait bound.
   *
   * For example:
   * ```rust
@@ -2799,7 +2799,7 @@ module Raw {
   *
   * For example:
   * ```rust
-   * foo();
+   *   foo();
   * //^^^
   * ```
   */
@@ -2895,7 +2895,6 @@ module Raw {
   * For example:
   * ```rust
   * (x + y)
-   * //^^^^^
   * ```
   */
  class ParenExpr extends @paren_expr, Expr {
@@ -4008,7 +4007,6 @@ module Raw {
   * For example:
   * ```rust
   * println!("Hello, world!");
-   * //^^^^^^^
   * ```
   */
  class MacroCall extends @macro_call, AssocItem, ExternItem, Item {
@@ -4264,7 +4262,7 @@ module Raw {
   * A Struct. For example:
   * ```rust
   * struct Point {
-   * x: i32,
+   *     x: i32,
   *     y: i32,
   * }
   * ```
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
@@ -24,7 +24,7 @@ module Generated {
   * A Struct. For example:
   * ```rust
   * struct Point {
-   * x: i32,
+   *     x: i32,
   *     y: i32,
   * }
   * ```
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
@@ -21,9 +21,9 @@ module Generated {
   * println!("{} {}!", "Hello", "world");
   * //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
-   * ```
+   * ```rust
   * macro_rules! foo { ($x:expr) => { $x + 1 }; }
-   * //                 ^^^^^^^^^^^^^^^^^^^^^^^
+   * //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   * ```
   * INTERNAL: Do not reference the `Generated::TokenTree` class directly.
   * Use the subclass `TokenTree`, where the following predicates are available.
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
@@ -17,7 +17,7 @@ import codeql.rust.elements.UseTreeList
 */
 module Generated {
  /**
-   * A `use` tree, ie the part after the `use` keyword in a `use` statement. For example:
+   * A `use` tree, that is, the part after the `use` keyword in a `use` statement. For example:
   * ```rust
   * use std::collections::HashMap;
   * use std::collections::*;
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
@@ -20,7 +20,7 @@ module Generated {
   * For example:
   * ```rust
   * use std::{fs, io};
-   * //        ^^^^^^^
+   * //       ^^^^^^^^
   * ```
   * INTERNAL: Do not reference the `Generated::UseTreeList` class directly.
   * Use the subclass `UseTreeList`, where the following predicates are available.
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
@@ -19,7 +19,7 @@ module Generated {
   *
   * For example:
   * ```rust
-   * pub struct S;
+   *   pub struct S;
   * //^^^
   * ```
   * INTERNAL: Do not reference the `Generated::Visibility` class directly.
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -42,7 +42,7 @@ ExternItemList/gen_extern_item_list.rs f9a03ddf20387871b96994915c9a725feb333d061
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
 FnPtrTypeRepr/gen_fn_ptr_type_repr.rs c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e
 ForExpr/gen_for_expr.rs 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122
-ForTypeRepr/gen_for_type_repr.rs 387b8e7bb9d548e822e5e62b29774681e39fb816f3f42f951674e98fc542f667 387b8e7bb9d548e822e5e62b29774681e39fb816f3f42f951674e98fc542f667
+ForTypeRepr/gen_for_type_repr.rs 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2
 FormatArgsExpr/gen_format.rs e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33 e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33
 FormatArgsExpr/gen_format_args_arg.rs 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f
 FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2
@@ -68,7 +68,7 @@ LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ed
 LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
 LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
 MacroBlockExpr/gen_macro_block_expr.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
-MacroCall/gen_macro_call.rs 0bbfb1f41c627583214ab80c94a7467fdb353862634510d4d00b93c6f30ef79b 0bbfb1f41c627583214ab80c94a7467fdb353862634510d4d00b93c6f30ef79b
+MacroCall/gen_macro_call.rs c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6 c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6
 MacroDef/gen_macro_def.rs 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378
 MacroExpr/gen_macro_expr.rs 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0
 MacroItems/gen_macro_items.rs c00f8045d9a7d6562da1d0136b335b685e2ec5dbd708763faa24a752e89feda4 c00f8045d9a7d6562da1d0136b335b685e2ec5dbd708763faa24a752e89feda4
@@ -83,13 +83,13 @@ Meta/gen_meta.rs 39172a1f7dd02fa3149e7a1fc1dc1f135aa87c84057ee721cd9b373517042b2
 MethodCallExpr/gen_method_call_expr.rs f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d
 Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
 Name/gen_name.rs 8a7fe65ee632a47d12eaa313e7248ac9210e5a381e9522499ca68f94c39e72c0 8a7fe65ee632a47d12eaa313e7248ac9210e5a381e9522499ca68f94c39e72c0
-NameRef/gen_name_ref.rs 74e7c112df2a764367792f51830561ee2f16777dd98098a5664869361f98c698 74e7c112df2a764367792f51830561ee2f16777dd98098a5664869361f98c698
+NameRef/gen_name_ref.rs c8c922e77a7d62b8272359ccdabbf7e15411f31ca85f15a3afdd94bec7ec64e7 c8c922e77a7d62b8272359ccdabbf7e15411f31ca85f15a3afdd94bec7ec64e7
 NeverTypeRepr/gen_never_type_repr.rs cc7d1c861eaf89772109f142815839976f25f89956ed1b11822df5e7e333d6d4 cc7d1c861eaf89772109f142815839976f25f89956ed1b11822df5e7e333d6d4
 OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
 OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
 Param/gen_param.rs 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9
 ParamList/gen_param_list.rs a842001c434b9716a131a77b5ec78ee5dd911ef7c42d22bf5e7bdac24c9a20bd a842001c434b9716a131a77b5ec78ee5dd911ef7c42d22bf5e7bdac24c9a20bd
-ParenExpr/gen_paren_expr.rs 58f59d66e833f1baeb0a61b4e8b5dc97680daad78bd0e90627f6dbb1ed0c62e0 58f59d66e833f1baeb0a61b4e8b5dc97680daad78bd0e90627f6dbb1ed0c62e0
+ParenExpr/gen_paren_expr.rs caaf419c59d65ca911479dea7d62756a55593b3da65b02942a36abd975389f29 caaf419c59d65ca911479dea7d62756a55593b3da65b02942a36abd975389f29
 ParenPat/gen_paren_pat.rs 47a0c5b6ec3e51452c2c2e6882ed98aca9891b08246ec231484df8d226985212 47a0c5b6ec3e51452c2c2e6882ed98aca9891b08246ec231484df8d226985212
 ParenTypeRepr/gen_paren_type_repr.rs 28194256a3d7bdcc49283f4be5e3ad3efb0ea2996126abed2a76c6cd9954c879 28194256a3d7bdcc49283f4be5e3ad3efb0ea2996126abed2a76c6cd9954c879
 ParenthesizedArgList/gen_parenthesized_arg_list.rs 161083eb292e1d70ca97b5afda8e27bc96db95678b39cb680de638ac0e49be72 161083eb292e1d70ca97b5afda8e27bc96db95678b39cb680de638ac0e49be72
@@ -115,7 +115,7 @@ SliceTypeRepr/gen_slice_type_repr.rs 4a85402d40028c5a40ef35018453a89700b2171bc62
 SourceFile/gen_source_file.rs c0469cc8f0ecce3dd2e77963216d7e8808046014533359a44c1698e48783b420 c0469cc8f0ecce3dd2e77963216d7e8808046014533359a44c1698e48783b420
 Static/gen_static.rs 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a
 StmtList/gen_stmt_list.rs adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db
-Struct/gen_struct.rs 8de3861997dfdd525b93bf8f8a857ed3e6b4d014a35d8a9298a236f2ff476a34 8de3861997dfdd525b93bf8f8a857ed3e6b4d014a35d8a9298a236f2ff476a34
+Struct/gen_struct.rs 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b
 StructExpr/gen_struct_expr.rs 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb
 StructExprField/gen_struct_expr_field.rs 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084
 StructExprFieldList/gen_struct_expr_field_list.rs bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc
@@ -124,7 +124,7 @@ StructFieldList/gen_struct_field_list.rs 3c24edef6a92a1b7bb785012d1e53eb69197fb6
 StructPat/gen_struct_pat.rs 3f972ff8a76acb61ef48bdea92d2fac8b1005449d746e6188fd5486b1f542e5c 3f972ff8a76acb61ef48bdea92d2fac8b1005449d746e6188fd5486b1f542e5c
 StructPatField/gen_struct_pat_field.rs dfdab8cef7dcfee40451744c8d2c7c4ae67fdb8bd054b894c08d62997942f364 dfdab8cef7dcfee40451744c8d2c7c4ae67fdb8bd054b894c08d62997942f364
 StructPatFieldList/gen_struct_pat_field_list.rs 06c0e56c78a6b28909d94d9519ba41ac8a6005741f82b947ef14db51e8cbebd0 06c0e56c78a6b28909d94d9519ba41ac8a6005741f82b947ef14db51e8cbebd0
-TokenTree/gen_token_tree.rs 694d5ea71e00792374f771c74532abd66f0af637f87fe3203630aa7ef866a96f 694d5ea71e00792374f771c74532abd66f0af637f87fe3203630aa7ef866a96f
+TokenTree/gen_token_tree.rs 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e3979d3957a8f94 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e3979d3957a8f94
 Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
 TraitAlias/gen_trait_alias.rs 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9
 TryExpr/gen_try_expr.rs f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e
@@ -143,11 +143,11 @@ UnderscoreExpr/gen_underscore_expr.rs fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63db
 Union/gen_union.rs 0adc276bf324661137b4de7c4522afd5f7b2776e913c4a6ecc580ce3d753a51d 0adc276bf324661137b4de7c4522afd5f7b2776e913c4a6ecc580ce3d753a51d
 Use/gen_use.rs 3a8a426109080ce2a0ed5a68a83cfa195196c9f0a14eff328b7be54d1131eede 3a8a426109080ce2a0ed5a68a83cfa195196c9f0a14eff328b7be54d1131eede
 UseBoundGenericArgs/gen_use_bound_generic_args.rs 1da801583b77f5f064d729a1d4313a863f1ad2e1dcc11c963194839cba977367 1da801583b77f5f064d729a1d4313a863f1ad2e1dcc11c963194839cba977367
-UseTree/gen_use_tree.rs cccf4c2c9045548ffd9f58e93b46aa434c0ca0671641863e7558047097db5dee cccf4c2c9045548ffd9f58e93b46aa434c0ca0671641863e7558047097db5dee
-UseTreeList/gen_use_tree_list.rs 6fc13cab53bb77475005499da717c7cd55648ba4c4d7d32c422624760ca6afc3 6fc13cab53bb77475005499da717c7cd55648ba4c4d7d32c422624760ca6afc3
+UseTree/gen_use_tree.rs 90660192ec361e96d0fee9dc03c34fcdf0a102269df33be45856c63ad5d18ff2 90660192ec361e96d0fee9dc03c34fcdf0a102269df33be45856c63ad5d18ff2
+UseTreeList/gen_use_tree_list.rs 2494aadcec03a3f7a6e2ae448ee70ec6774f840e9519c668b2afe8cd968211c9 2494aadcec03a3f7a6e2ae448ee70ec6774f840e9519c668b2afe8cd968211c9
 Variant/gen_variant.rs fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6 fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6
 VariantList/gen_variant_list.rs a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d
-Visibility/gen_visibility.rs 696f86b56e28a17ffb373170e192a76c288b0750dfa6e64fac0d8b4a77b0468c 696f86b56e28a17ffb373170e192a76c288b0750dfa6e64fac0d8b4a77b0468c
+Visibility/gen_visibility.rs cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52 cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52
 WhereClause/gen_where_clause.rs 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a
 WherePred/gen_where_pred.rs dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619 dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619
 WhileExpr/gen_while_expr.rs 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
@@ -1,7 +1,7 @@
 // generated by codegen, do not edit

 fn test_for_type_repr() -> () {
-    // A higher-ranked trait bound(HRTB) type.
+    // A higher-ranked trait bound.
    // 
    // For example:
    fn foo<T>(value: T)
--- a/rust/ql/test/extractor-tests/generated/MacroCall/gen_macro_call.rs
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/gen_macro_call.rs
@@ -5,5 +5,4 @@ fn test_macro_call() -> () {
    // 
    // For example:
    println!("Hello, world!");
-    //^^^^^^^
 }
--- a/rust/ql/test/extractor-tests/generated/NameRef/gen_name_ref.rs
+++ b/rust/ql/test/extractor-tests/generated/NameRef/gen_name_ref.rs
@@ -4,6 +4,6 @@ fn test_name_ref() -> () {
    // A reference to a name.
    // 
    // For example:
-    foo();
+      foo();
    //^^^
 }
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
@@ -5,5 +5,4 @@ fn test_paren_expr() -> () {
    // 
    // For example:
    (x + y)
-    //^^^^^
 }
--- a/rust/ql/test/extractor-tests/generated/Struct/gen_struct.rs
+++ b/rust/ql/test/extractor-tests/generated/Struct/gen_struct.rs
@@ -3,7 +3,7 @@
 fn test_struct() -> () {
    // A Struct. For example:
    struct Point {
-    x: i32,
+        x: i32,
        y: i32,
    }
 }
--- a/rust/ql/test/extractor-tests/generated/TokenTree/gen_token_tree.rs
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/gen_token_tree.rs
@@ -7,5 +7,5 @@ fn test_token_tree() -> () {
    println!("{} {}!", "Hello", "world");
    //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    macro_rules! foo { ($x:expr) => { $x + 1 }; }
-    //                 ^^^^^^^^^^^^^^^^^^^^^^^
+    //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
--- a/rust/ql/test/extractor-tests/generated/UseTree/gen_use_tree.rs
+++ b/rust/ql/test/extractor-tests/generated/UseTree/gen_use_tree.rs
@@ -1,7 +1,7 @@
 // generated by codegen, do not edit

 fn test_use_tree() -> () {
-    // A `use` tree, ie the part after the `use` keyword in a `use` statement. For example:
+    // A `use` tree, that is, the part after the `use` keyword in a `use` statement. For example:
    use std::collections::HashMap;
    use std::collections::*;
    use std::collections::HashMap as MyHashMap;
--- a/rust/ql/test/extractor-tests/generated/UseTreeList/gen_use_tree_list.rs
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/gen_use_tree_list.rs
@@ -5,5 +5,5 @@ fn test_use_tree_list() -> () {
    // 
    // For example:
    use std::{fs, io};
-    //        ^^^^^^^
+    //       ^^^^^^^^
 }
--- a/rust/ql/test/extractor-tests/generated/Visibility/gen_visibility.rs
+++ b/rust/ql/test/extractor-tests/generated/Visibility/gen_visibility.rs
@@ -4,6 +4,6 @@ fn test_visibility() -> () {
    // A visibility modifier.
    // 
    // For example:
-    pub struct S;
+      pub struct S;
    //^^^
 }