From 9c95a1788290c13bc460cf901a890265682f5fbe Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Mon, 28 Oct 2024 12:41:05 +0100 Subject: [PATCH] Rust: add block ids to canonical paths, making them "extended" --- rust/extractor/src/generated/.generated.list | 2 +- rust/extractor/src/generated/top.rs | 4 +- rust/extractor/src/translate/base.rs | 7 +- rust/ql/.generated.list | 72 +++++++++---------- rust/ql/.gitattributes | 34 ++++----- .../rust/elements/internal/generated/Item.qll | 16 +++-- .../rust/elements/internal/generated/Raw.qll | 8 ++- rust/ql/lib/rust.dbscheme | 4 +- .../canonical_path.expected} | 20 +++--- .../canonical_path.ql} | 4 +- .../canonical_paths.rs | 8 +++ .../extractor-tests/generated/Const/Const.ql | 13 ++-- ...> Const_getExtendedCanonicalPath.expected} | 0 ...h.ql => Const_getExtendedCanonicalPath.ql} | 2 +- .../extractor-tests/generated/Enum/Enum.ql | 10 ++- ...=> Enum_getExtendedCanonicalPath.expected} | 0 ...th.ql => Enum_getExtendedCanonicalPath.ql} | 2 +- .../generated/ExternBlock/ExternBlock.ql | 12 ++-- ...rnBlock_getExtendedCanonicalPath.expected} | 0 ...> ExternBlock_getExtendedCanonicalPath.ql} | 2 +- .../generated/ExternCrate/ExternCrate.ql | 10 ++- ...rnCrate_getExtendedCanonicalPath.expected} | 0 ...> ExternCrate_getExtendedCanonicalPath.ql} | 2 +- .../generated/Function/Function.expected | 4 +- .../generated/Function/Function.ql | 19 +++-- ...unction_getExtendedCanonicalPath.expected} | 0 ...l => Function_getExtendedCanonicalPath.ql} | 2 +- .../extractor-tests/generated/Impl/Impl.ql | 10 ++- ...=> Impl_getExtendedCanonicalPath.expected} | 0 ...th.ql => Impl_getExtendedCanonicalPath.ql} | 2 +- .../generated/MacroCall/MacroCall.expected | 2 +- .../generated/MacroCall/MacroCall.ql | 12 ++-- ...croCall_getExtendedCanonicalPath.expected} | 0 ... => MacroCall_getExtendedCanonicalPath.ql} | 2 +- .../generated/MacroDef/MacroDef.ql | 16 +++-- ...acroDef_getExtendedCanonicalPath.expected} | 0 ...l => MacroDef_getExtendedCanonicalPath.ql} | 2 +- .../generated/MacroRules/MacroRules.ql | 10 ++- ...roRules_getExtendedCanonicalPath.expected} | 0 ...=> MacroRules_getExtendedCanonicalPath.ql} | 2 +- .../generated/Module/Module.expected | 6 +- .../generated/Module/Module.ql | 10 ++- ... Module_getExtendedCanonicalPath.expected} | 0 ....ql => Module_getExtendedCanonicalPath.ql} | 2 +- .../generated/Static/Static.ql | 12 ++-- ... Static_getExtendedCanonicalPath.expected} | 0 ....ql => Static_getExtendedCanonicalPath.ql} | 2 +- .../generated/Struct/Struct.ql | 10 ++- ... Struct_getExtendedCanonicalPath.expected} | 0 ....ql => Struct_getExtendedCanonicalPath.ql} | 2 +- .../generated/Trait/Trait.expected | 4 +- .../extractor-tests/generated/Trait/Trait.ql | 10 ++- ...> Trait_getExtendedCanonicalPath.expected} | 0 ...h.ql => Trait_getExtendedCanonicalPath.ql} | 2 +- .../generated/TraitAlias/TraitAlias.ql | 10 ++- ...itAlias_getExtendedCanonicalPath.expected} | 0 ...=> TraitAlias_getExtendedCanonicalPath.ql} | 2 +- .../generated/TypeAlias/TypeAlias.ql | 10 ++- ...peAlias_getExtendedCanonicalPath.expected} | 0 ... => TypeAlias_getExtendedCanonicalPath.ql} | 2 +- .../extractor-tests/generated/Union/Union.ql | 10 ++- ...> Union_getExtendedCanonicalPath.expected} | 0 ...h.ql => Union_getExtendedCanonicalPath.ql} | 2 +- .../test/extractor-tests/generated/Use/Use.ql | 12 ++-- ... => Use_getExtendedCanonicalPath.expected} | 0 ...ath.ql => Use_getExtendedCanonicalPath.ql} | 2 +- rust/schema/annotations.py | 6 +- 67 files changed, 262 insertions(+), 169 deletions(-) rename rust/ql/test/extractor-tests/{canonical_name/canonical_name.expected => canonical_path/canonical_path.expected} (57%) rename rust/ql/test/extractor-tests/{canonical_name/canonical_name.ql => canonical_path/canonical_path.ql} (53%) rename rust/ql/test/extractor-tests/{canonical_name => canonical_path}/canonical_paths.rs (86%) rename rust/ql/test/extractor-tests/generated/Const/{Const_getCanonicalPath.expected => Const_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Const/{Const_getCanonicalPath.ql => Const_getExtendedCanonicalPath.ql} (77%) rename rust/ql/test/extractor-tests/generated/Enum/{Enum_getCanonicalPath.expected => Enum_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Enum/{Enum_getCanonicalPath.ql => Enum_getExtendedCanonicalPath.ql} (77%) rename rust/ql/test/extractor-tests/generated/ExternBlock/{ExternBlock_getCanonicalPath.expected => ExternBlock_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/ExternBlock/{ExternBlock_getCanonicalPath.ql => ExternBlock_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/ExternCrate/{ExternCrate_getCanonicalPath.expected => ExternCrate_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/ExternCrate/{ExternCrate_getCanonicalPath.ql => ExternCrate_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Function/{Function_getCanonicalPath.expected => Function_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Function/{Function_getCanonicalPath.ql => Function_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Impl/{Impl_getCanonicalPath.expected => Impl_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Impl/{Impl_getCanonicalPath.ql => Impl_getExtendedCanonicalPath.ql} (77%) rename rust/ql/test/extractor-tests/generated/MacroCall/{MacroCall_getCanonicalPath.expected => MacroCall_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/MacroCall/{MacroCall_getCanonicalPath.ql => MacroCall_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/MacroDef/{MacroDef_getCanonicalPath.expected => MacroDef_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/MacroDef/{MacroDef_getCanonicalPath.ql => MacroDef_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/MacroRules/{MacroRules_getCanonicalPath.expected => MacroRules_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/MacroRules/{MacroRules_getCanonicalPath.ql => MacroRules_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Module/{Module_getCanonicalPath.expected => Module_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Module/{Module_getCanonicalPath.ql => Module_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Static/{Static_getCanonicalPath.expected => Static_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Static/{Static_getCanonicalPath.ql => Static_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Struct/{Struct_getCanonicalPath.expected => Struct_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Struct/{Struct_getCanonicalPath.ql => Struct_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Trait/{Trait_getCanonicalPath.expected => Trait_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Trait/{Trait_getCanonicalPath.ql => Trait_getExtendedCanonicalPath.ql} (77%) rename rust/ql/test/extractor-tests/generated/TraitAlias/{TraitAlias_getCanonicalPath.expected => TraitAlias_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/TraitAlias/{TraitAlias_getCanonicalPath.ql => TraitAlias_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/TypeAlias/{TypeAlias_getCanonicalPath.expected => TypeAlias_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/TypeAlias/{TypeAlias_getCanonicalPath.ql => TypeAlias_getExtendedCanonicalPath.ql} (78%) rename rust/ql/test/extractor-tests/generated/Union/{Union_getCanonicalPath.expected => Union_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Union/{Union_getCanonicalPath.ql => Union_getExtendedCanonicalPath.ql} (77%) rename rust/ql/test/extractor-tests/generated/Use/{Use_getCanonicalPath.expected => Use_getExtendedCanonicalPath.expected} (100%) rename rust/ql/test/extractor-tests/generated/Use/{Use_getCanonicalPath.ql => Use_getExtendedCanonicalPath.ql} (77%) diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list index 80823d5e7961..d6b6eac35e84 100644 --- a/rust/extractor/src/generated/.generated.list +++ b/rust/extractor/src/generated/.generated.list @@ -1,2 +1,2 @@ mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 -top.rs 781f69884739378b8b401f67c795fda457996dc2ee0785ce143dc6d9a2607f13 781f69884739378b8b401f67c795fda457996dc2ee0785ce143dc6d9a2607f13 +top.rs 60b0821a7535361e4f0dd280d654c4d8167fca919bda082b17f91ff9878788a5 60b0821a7535361e4f0dd280d654c4d8167fca919bda082b17f91ff9878788a5 diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs index 70a2079c4813..8fa8cac061d0 100644 --- a/rust/extractor/src/generated/top.rs +++ b/rust/extractor/src/generated/top.rs @@ -5129,8 +5129,8 @@ pub struct Item { } impl Item { - pub fn emit_canonical_path(id: trap::Label, value: String, out: &mut trap::Writer) { - out.add_tuple("item_canonical_paths", vec![id.into(), value.into()]); + pub fn emit_extended_canonical_path(id: trap::Label, value: String, out: &mut trap::Writer) { + out.add_tuple("item_extended_canonical_paths", vec![id.into(), value.into()]); } pub fn emit_crate_origin(id: trap::Label, value: String, out: &mut trap::Writer) { out.add_tuple("item_crate_origins", vec![id.into(), value.into()]); diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs index de83096dafb4..10240632ff51 100644 --- a/rust/extractor/src/translate/base.rs +++ b/rust/extractor/src/translate/base.rs @@ -5,6 +5,7 @@ use crate::trap::{DiagnosticSeverity, TrapFile, TrapId}; use crate::trap::{Label, TrapClass}; use codeql_extractor::trap::{self}; use log::Level; +use ra_ap_base_db::salsa::InternKey; use ra_ap_base_db::CrateOrigin; use ra_ap_hir::db::ExpandDatabase; use ra_ap_hir::{Adt, ItemContainer, Module, Semantics, Type}; @@ -347,9 +348,9 @@ impl<'a> Translator<'a> { } fn canonical_path_from_hir_module(&self, item: Module) -> Option { - if ModuleId::from(item).is_block_module() { + if let Some(block_id) = ModuleId::from(item).containing_block() { // this means this is a block module, i.e. a virtual module for a block scope - return None; + return Some(format!("{{{}}}", block_id.as_intern_id())); } if item.is_crate_root() { return Some("crate".into()); @@ -407,7 +408,7 @@ impl<'a> Translator<'a> { let path = self.canonical_path_from_hir(def)?; let origin = self.origin_from_hir(def); generated::Item::emit_crate_origin(label, origin, &mut self.trap.writer); - generated::Item::emit_canonical_path(label, path, &mut self.trap.writer); + generated::Item::emit_extended_canonical_path(label, path, &mut self.trap.writer); Some(()) })(); } diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list index 4a131d90d6da..c42ae033fc96 100644 --- a/rust/ql/.generated.list +++ b/rust/ql/.generated.list @@ -513,7 +513,7 @@ lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0b lib/codeql/rust/elements/internal/generated/ImplTraitType.qll 3c29684f5ef386b883b79dc9758441d97f090e065be177ffc8240aaf0f3d1e7b 03ea42c2a95cf917ec73d88b7b4ca5e53e10d7b046074f59100c0ec6c2c1ed6d lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d lib/codeql/rust/elements/internal/generated/InferType.qll 23ee25135c59ea5578cdf7c34a41f606e217e7260c3c8f404d12836585d5cad4 400da322fa1be62c4e300ebdf481eb92d4226eb6c316c668da8cc5168065774f -lib/codeql/rust/elements/internal/generated/Item.qll 26a081e7c8bcac6588e6792b48e3243a645f6ef284d26c8a8230dd81d44404b2 876d306eb9781bdb4bc547eefb75d1c4356a7425ac55da5541143212c7e695ca +lib/codeql/rust/elements/internal/generated/Item.qll 25e645cb41222c21065798fb6cb0488bfef007aeb9b89717f58913f9b29d5559 3146941e55db2ff7c51ec030b4414e20d66d154cf6854b1a3fa42e74a09dfb77 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/LetElse.qll 7ca556118b5446bfc85abba8f0edd4970e029b30d414ea824a1b5f568310a76c a403540881336f9d0269cbcdb4b87107a17ab234a985247dc52a380f150a1641 @@ -565,7 +565,7 @@ lib/codeql/rust/elements/internal/generated/PtrType.qll 40099c5a4041314b66932dfd lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590 ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9 lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b -lib/codeql/rust/elements/internal/generated/Raw.qll ba1bace74a88ccfdc45dbc3770ce3661446ef6f89a934a969d440d9253d162c1 60d38756cb1f876260473bfc18b7fbeac5c984ef1675f452cdefaa422c04ae16 +lib/codeql/rust/elements/internal/generated/Raw.qll 33a346db246b169742c9f3c00b70a631f1305c2273b9abbeee9ef0dbc7b711c8 8eab21f53c60c1df042c6850b5d3474ad6330a3a71166e8e96a2738c7720800c lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0 @@ -688,11 +688,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 daadacd1181e969f804a77fab31f6a8eaec3a0837ddfb8be810b87092e7c307e d41ad909279ea5b41e7ec47dbc19904a9c6f8161a7360a58567553c7d0fdc07a +test/extractor-tests/generated/Const/Const.ql fff4c81591a1f5e691f2ad242e8fe8e2b0d6b0f974e312a2a0bdb7de80b985b5 0cdf3eba64d5d66d5069727bad08cbeb1266456f61b3967d27f542412cf56d47 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026 -test/extractor-tests/generated/Const/Const_getCanonicalPath.ql 7737e999249e6dffcfe4386671b5c45e3916aaf2852bca889371d1c825444b8c e3473de4fcaf4c4d3c63b740a5879caf463a2e44cda5c12874e4110be433cb8f test/extractor-tests/generated/Const/Const_getCrateOrigin.ql f042bf15f9bde6c62d129601806c79951a2a131b6388e8df24b1dc5d17fe89f7 7c6decb624f087fda178f87f6609510907d2ed3877b0f36e605e2422b4b13f57 +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_getTy.ql bf9abfd2be9d22193bc6be9916c7171d79ae7fcdaabf1fc9659997d11d2f074e 133348f60312055fe112eca3a0ef2e1e210b1690261dd9b06979214908d59097 test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661 @@ -710,10 +710,10 @@ test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae9872d92fa9b15343c93da545c2b0e15b4f27f2296c200fd4611b68858d5 52a209022e3b83260b4ef5513ffbcc1ca1f7c21bad2c721a0d3698793d2161d2 test/extractor-tests/generated/DynTraitType/DynTraitType.ql db4cf318a76eaedaa9a9deaf11009a24497b88557439c2e0560290efe950ca05 e0fcd8be6bbe2e305ac16e25925a50206f36cba25cb0bc4c7e9b166d2ee6b19f test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql d04a1836c28f14884771f5868d5a3f551d9251c3c3a6c07a4dd9dbef6b764875 9c590f1ecd375c22fbc0ad5657243ef40fe7a7684ee81e57e7efbb73544d4398 -test/extractor-tests/generated/Enum/Enum.ql 3cf6d51e15aeb1fcaa25d0de773b5d681afd2bed38c5637aa10457ed8b9f05d4 f735c667e86d222f706f7abe7cebecb9f23c6dd9dad850d7adfcf3c45d89642f +test/extractor-tests/generated/Enum/Enum.ql ed518d828d8e2e4790849284de1d0d5e728dbc2fe5e9f187e8ebfa2d503efd5a 7092b963eb133371e1cbc09d45f8c2308d7093523140b351d67073a8d258643e test/extractor-tests/generated/Enum/Enum_getAttr.ql 8109ef2495f4a154e3bb408d549a16c6085e28de3aa9b40b51043af3d007afa7 868cf275a582266ffa8da556d99247bc8af0fdf3b43026c49e250cf0cac64687 -test/extractor-tests/generated/Enum/Enum_getCanonicalPath.ql 1fc1c7a5049a9c348f9c93fa40e17da84406e9155db69892303ddab38cd05447 389dfb9ec6e72ca100cd9d375abb0a571f7c9ebdb3581b703b7f342f11e9f439 test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql 76d32838b7800ed8e5cab895c9dbea76129f96afab949598bebec2b0cb34b7ff 226d099377c9d499cc614b45aa7e26756124d82f07b797863ad2ac6a6b2f5acb +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 test/extractor-tests/generated/Enum/Enum_getVariantList.ql eb30e972b93770be1b64eb387814b99b3901e8884dd74701c5478574242f5269 43e2f53c339f27e71954a96e218f6fc8a631b827457f718693eb2c79737b6cb0 @@ -721,16 +721,16 @@ 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 4c26a931cacc91df8846052b1af55c13f1abab23aabe740c12aaa35a651080c3 cb533af42b5ade1269a056c79e18dafa35792b5ff7f4de5670499532a0f27232 +test/extractor-tests/generated/ExternBlock/ExternBlock.ql 45233abdf39caefd2d1d236990a5fbf06eb0b547d892f1ad3e82b8e3c215bc79 df30e0370ed20bef3b2c5bed6e8c27b27663716e7c9e14e85acb6e33a43f4edc 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_getCanonicalPath.ql c8a6b799fb2b5fb7f14538336d400f18ed5b9450eead27477142a3ae5c632c61 59cfb18e8cf2393e964f96d0b97ca858f4c3e9d8505518f55eb647ea6046a05f test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql 5a2e0b546e17a998156f48f62e711c8a7b920d352516de3518dfcd0dfedde82d 1d11b8a790c943ef215784907ff2e367b13737a5d1c24ad0d869794114deaa32 +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 ba1898a33a793a19adb4556f105cbee48a18c1db0df359efe482a0a0a1e06a45 09180d5dffd90c8027d33c30c6393d49f2bcf394c52a06abdfb3dca8ff0b2346 +test/extractor-tests/generated/ExternCrate/ExternCrate.ql c4313ed4790d6c085f47d6c14b11bfa67f7758a1f160758a385bcfcd37284151 9a761086cd80a6fdb7a41f2f6887e1c0b8b3aa19ada0b1dcc74a57646338ecc9 test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql cbe8efdfdbe5d46b4cd28d0e9d3bffcf08f0f9a093acf12314c15b692a9e502e 67fe03af83e4460725f371920277186c13cf1ed35629bce4ed9e23dd3d986b95 -test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.ql c4c0346e43710986270b26be5739f46f52326740563bb8092b6e8c9fa2098b3a 85cc440df53bb13fb93a59d0aa70f92e8f072935294485967a338c73220cc53e test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql c0bf9ba36beb93dc27cd1c688f18b606f961b687fd7a7afd4b3fc7328373dcfb 312da595252812bd311aecb356dd80f2f7dc5ecf77bc956e6478bbe96ec72fd9 +test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql 88e16e2bbef466cec43ace25716e354408b5289f9054eaafe38abafd9df327e3 83a69487e16d59492d44d8c02f0baf7898c88ed5fcf67c73ed89d80f00c69fe8 test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql 4bbc210ed3114f355a36768fc8173dfb65bd683bdf47491a30890cf110a6fb2c cd9c1b52dd350337e946fb43243de1504f0ae44d81668dab3629f2b7c2651572 test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql 52007ef7745e7ceb394de73212c5566300eb7962d1de669136633aea0263afb2 da98779b9e82a1b985c1b1310f0d43c784e5e66716a791ac0f2a78a10702f34b test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql d2c13d0c19a5ef81ca776f03a7259e743adbfa66ef440f7d402cd97391ecdfc4 c678f6ac0a075c1e0adc3768a344dbeebcf0d13e30878546094777e3fcdf92bd @@ -761,12 +761,12 @@ test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 0cd439f61569ecf0 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql 8f692486be1546b914b17abdff4a989dfbaa889bfa1fc44597f4357806c1a1dd da9fd237e31e9c8dd0ef0c3c968157815b87d3e8dcdfd74674c988ce2ab6d270 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql 1f9bf1344f942e65c3a3591b6ae04d3f5a2a1a65459bce0d976698de7d8a5958 02acb861d8ab4d32cf144c589881a888c3da5e2ade27e8c85fec3ae45219bb3b test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql c912ac37275cbe7b3b29607bed1a3190c80779436422c14a475113e1bfd91a54 ef90f67a9b952a38ce557b1afbf0b5ce8551e83ddfaad8309a0c9523e40b5ea7 -test/extractor-tests/generated/Function/Function.ql 0b7d2a01f0ac7bf669710117307aef85aa411f2113bc5738e3486f9fffc8a566 49980b05bf7642df5429bd831672772bf6e838ee8b98594bafd63b51e106f987 +test/extractor-tests/generated/Function/Function.ql c1c2a9b68c35f839ccd2b5e62e87d1acd94dcc2a3dc4c307c269b84b2a0806e6 1c446f19d2f81dd139aa5a1578d1b165e13bddbaeab8cfee8f0430bced3a99ab 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_getBody.ql cf2716a751e309deba703ee4da70e607aae767c1961d3c0ac5b6728f7791f608 3beaf4032924720cb881ef6618a3dd22316f88635c86cbc1be60e3bdad173e21 -test/extractor-tests/generated/Function/Function_getCanonicalPath.ql 22775208d059fb634903123a4b98e413c9493c507d5095236bfe17639863cf96 a76b74443954bf2395c242374d0ceee531f18890c18ef79f31db9b73229d477f test/extractor-tests/generated/Function/Function_getCrateOrigin.ql acec761c56b386600443411cabb438d7a88f3a5e221942b31a2bf949e77c14b4 ff2387acb13eebfad614b808278f057a702ef4a844386680b8767f9bb4438461 +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 test/extractor-tests/generated/Function/Function_getParamList.ql f888802ab00defb58de59cc39d1e0518e3884db7eaf845f39dfa55befdda58b2 ba0d1a07676f1c987b820a3d126a563ecf9a3d53ac1115b87a5af487a8a03c3e @@ -786,11 +786,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 5b8e4b024707aba29a308885ad902161f21d946031d04c003bb355cdaa1fd2a9 ebb8299b92de07f25340c11ec7f01162261ca2e5c8e52ce454346fea086ec3ce +test/extractor-tests/generated/Impl/Impl.ql c473ab1d919fc56b641684b9eb7ba0e65defe554e1bb2fa603b8246a896aa574 16f2f7d8456aee81b395bf8e44fcf0562cfa44294fa03e4f85f3b06f5ff1c57f 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_getCanonicalPath.ql ab036cae598c5c50cdbc3df81a4f3c579dbe642d160741e4ad65eb12f256f334 f8f2eb65a3cefc528d5baf92b0728c3850d1e72b4679800748cc33d3985bd842 test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql 494d5524ef7bac1286b8a465e833e98409c13f3f8155edab21d72424944f2ed9 b238ef992fce97699b14a5c45d386a2711287fd88fa44d43d18c0cdfd81ed72c +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 test/extractor-tests/generated/Impl/Impl_getTrait.ql 3319d2649b4a7f3c501c8e16a1a3e5d74057c94c02772d33f19b4030daf934d2 3acca9d040c3f1d90ed26b159dac71625bea689221e180c856a75c2bab95d286 @@ -837,19 +837,19 @@ test/extractor-tests/generated/LoopExpr/LoopExpr.ql 636c28bff5f8c1ca0fb834f614b3 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 ee463d91b185a3d50a3620a85378a324f7c337c8e63d6c28c88e141aab3bf0e6 c7cc614676e5df76390a872b6eed0838e58a7550f51cfaf081fac6e17dd7b904 +test/extractor-tests/generated/MacroCall/MacroCall.ql f41552ce4c8132db854132e445aa0c8df514bfd375aa71cc9ed0ae838b7df9f1 442ecbe1481084bb072c6f8cf0eb595b7ad371587e8708610a10f2cc718535f7 test/extractor-tests/generated/MacroCall/MacroCall_getAttr.ql c22a2a29d705e85b03a6586d1eda1a2f4f99f95f7dfeb4e6908ec3188b5ad0ad 9b8d9dcc2116a123c15c520a880efab73ade20e08197c64bc3ed0c50902c4672 -test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.ql e11be6799451e1833b27610c7d086a606fa954bacacbf05c65de88bcecef0e11 c81f43be23035953a62bdc685e2862266b43859855c4145a5bd585d984737ae5 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_getPath.ql 160edc6a001a2d946da6049ffb21a84b9a3756e85f9a2fb0a4d85058124b399a 1e25dd600f19ef89a99f328f86603bce12190220168387c5a88bfb9926da56d9 test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.ql 1cbf6b1ac7fa0910ff299b939743153fc00ad7e28a9a70c69a8297c6841e8238 570380c0dc4b20fe25c0499378569720a6da14bdb058e73d757e174bdd62d0c0 -test/extractor-tests/generated/MacroDef/MacroDef.ql 0ed1f4539b4fa24095d67a79a4ecc976fd302de2e3a6d868812985566c73e3e0 0729b90178176d1472d1dba7402165202f310ec505364112867d1fff1fd98beb +test/extractor-tests/generated/MacroDef/MacroDef.ql b8186c22beb7f818a30fe80f36d2e4207887445863e4deeae88bd03c24863dbb 71bebfb1b57b56ea479bc6edd714a4f01bfce2fa8e12fb9eb1481f9dffa4515e 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_getBody.ql 7b350f48e6f208d9fa4725919efd439baf5e9ec4563ba9be261b7a17dacc451b 33f99a707bb89705c92195a5f86055d1f6019bcd33aafcc1942358a6ed413661 -test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.ql 73617ab1d9f6705a613b6eb56b8eec819aee464b233c1c915789d411bcd447a1 4a2a502b35638a776469b246dcd1638a4cd3e77478565703ccbc7b6dc36b8f12 test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql 6c46366798df82ed96b8fb1efeb46bd84c2660f226ff2359af0041d5cdf004ba 8ab22599ef784dcad778d86828318699c2230c8927ae98ab0c60ac4639d6d1b5 +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 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 69445cf24f5bec5c3f11f0ebf13604891bb2c0dffe715612628e5572587c7a6c 5434db79d94e437c86126d9cf20bf1e86e5537f462a57b9bf6b22a2caa95cc40 @@ -858,10 +858,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 2624d48bde6b9a6ce846d57c841038600cd300c2cddf5f56c7c87f8c1599d344 bf77c6a9cac7fdbe444043b1e3b53bcc026e73542776c8b7e3dcc5820429bf8d +test/extractor-tests/generated/MacroRules/MacroRules.ql e8a243a1aa368d44c963d81b4459aa6eba7caf514d4865af5007cc33fe53dde4 9e9114cb808239e3bb15403cf5712f8dbaf4e2719e74efddbb800ec0be19f06a test/extractor-tests/generated/MacroRules/MacroRules_getAttr.ql 7de501c724e3465520cdc870c357911e7e7fce147f6fb5ed30ad37f21cf7d932 0d7754b89bcad6c012a0b43ee4e48e64dd20b608b3a7aeb4042f95eec50bb6e6 -test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.ql 18798d1de82776729e42e2044987d1b9d116cd5f2e08ebafa24f92ca833507fd 556b10708e758c534e84d6408cc68c50b715c5d452cab7adb11dffed5450f208 test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql fccedeee10ef85be3c26f6360b867e81d4ebce3e7f9cf90ccb641c5a14e73e7d 28c38a03a7597a9f56032077102e7a19378b0f3f3a6804e6c234526d0a441997 +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 test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f470d21ebcbe6e98436334b0bf5ba819a0ae186569ba7e88c31636c6 fcbf5c54e5a904767a6f4d37d853072aa0040738e622c49c9a02dec8739d6587 @@ -894,10 +894,10 @@ test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a0 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql 655db9a0501b1ef20d604cc4cd9d708371781291443e8dec97b70ec2914601d2 2fc7df0eca22dcef2f9f5c86d37ee43452d372a4c0f9f4da0194828c82ba93e0 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql 9a4829a174388e818f0c63ee6b8bdf1b68beaab48f51734ec6cc14635d24001c f57c9cdaf5235aad604f60b53ce92e73946d03a085f95ed051a26683967be4ba test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql 77407ac956c897ff7234132de1a825f1af5cfd0b6c1fd3a30f64fe08813d56db d80719e02d19c45bd6534c89ec7255652655f5680199854a0a6552b7c7793249 -test/extractor-tests/generated/Module/Module.ql d743894bea73be94bc6906f59125eb40ff21b8acc19940da69798338b33c6171 ecd6da53b6e82773b8617a915b0ee02e61ca065fa702d04b292a01739d3ce530 +test/extractor-tests/generated/Module/Module.ql 4bc4d74921a5af94b124a5010cdf6908cdc9ecf26124e354155fba781009071f acca26579b087ce1fc674703c4d95d8d353075d3021c464d2f3fc06891716774 test/extractor-tests/generated/Module/Module_getAttr.ql b97ae3f5175a358bf02c47ec154f7c2a0bd7ca54d0561517008d59344736d5cd f199116633c183826afa9ab8e409c3bf118d8e626647dbc617ae0d40d42e5d25 -test/extractor-tests/generated/Module/Module_getCanonicalPath.ql d700ee897697745c08fcf6cfbaf979b621f51bf2e221a4a99b59518f9bf6105f 947338c5590db48733a331e870e58a9eb78e0dca75e463dccff162a437483e78 test/extractor-tests/generated/Module/Module_getCrateOrigin.ql ff479546bf8fe8ef3da60c9c95b7e8e523c415be61839b2fff5f44c146c4e7df b14d3c0577bd6d6e3b6e5f4b93448cdccde424e21327a2e0213715b16c064a52 +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 test/extractor-tests/generated/Module/Module_getVisibility.ql bdce43e97b99226f55c84547a84d99b44f5d1eac757d49bcc06d732e0fb0b5a8 a482c18851286fb14ec6f709dc7f3280a62de8c3d59c49ba29d07bd24cf416cd @@ -1017,11 +1017,11 @@ test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b 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 445b9a4fbe69a3543a5afc3c8b26f00e01fe2dd3106530661af77bd13fdddf34 63e32ca183af0cb0c7727f880e616ccbbeda2ae6fc4107f071ed8e1310f2ca3d +test/extractor-tests/generated/Static/Static.ql b4266fc731d027e00825cbb02d27f9dde50c7e8d32fd6b571cb167da64a8747e 9dd9c4dd56210adcfbd1bd387d79f27a30394e7b8b9c81cc2553a718f36cca5a test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2 test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f -test/extractor-tests/generated/Static/Static_getCanonicalPath.ql b259ce842d2286f6c36b0a942dd724ef447c886cc2e1aeb51359a933800b959c 2a5a035ca6c6dc2411c929652739630a23042600d32fe7e0f22135a1227f75b4 test/extractor-tests/generated/Static/Static_getCrateOrigin.ql f24ac3dac6a6e04d3cc58ae11b09749114a89816c28b96bf6be0e96b2e20d37f e4051426c5daa7e73c1a5a9023d6e50a2b46ebf194f45befbe3dd45e64831a55 +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_getTy.ql 1f282ac9c52b8d9efa1eb7f963767d0af28332c99baf283b3818edf53b3b8b9f 656cd5516601e21ffd54c51934bbbbe293de0b30a4327240208f5bd51ed524b7 test/extractor-tests/generated/Static/Static_getVisibility.ql 0672b27f16955f7b0223a27c037884338dcf30759b7b8bb3da44e5d533228f90 0e4916f5683963041ef23c724ca8e16acfa370b583d90b76508c87131b9e1c73 @@ -1029,10 +1029,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 905f809ba79c7230ac0dcd1afc07840ec9e9435a9175260421898c3b61e13b8c 527f98d58ab9bb4c0d8dc6b5bd1b4658dd40cca4a7d7cccd6e0d1464ca19149e +test/extractor-tests/generated/Struct/Struct.ql 14dc5ead6bed88c2c79d9fd3874198f845d8202290b0931b2d2375c0a397c44a 408b07b6bb40ca09f51d2becd94501cc2b95ec52e04ccc2703c2e25d6577b4c6 test/extractor-tests/generated/Struct/Struct_getAttr.ql 028d90ddc5189b82cfc8de20f9e05d98e8a12cc185705481f91dd209f2cb1f87 760780a48c12be4581c1675c46aae054a6198196a55b6b989402cc29b7caf245 -test/extractor-tests/generated/Struct/Struct_getCanonicalPath.ql c3c09ee605cade0f250818db21abce9311c8b0ada4687dc8b0de0275ae3bc3ad 4e64a3fbe2e95ebd50d4f66ad0c2b6ab1ec89795faef9a1efb06995786fd2b7a test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql 289622244a1333277d3b1507c5cea7c7dd29a7905774f974d8c2100cea50b35f d32941a2d08d7830b42c263ee336bf54de5240bfc22082341b4420a20a1886c7 +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 test/extractor-tests/generated/Struct/Struct_getName.ql 8f1d9da4013307b4d23a1ce5dc76466ecdd7f0010b5148ec2e7dd2883efe3427 411b326d15d56713c2a5e6d22909474c5d33062296518221e36c920927f859fe @@ -1042,20 +1042,20 @@ 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 cc4a3abeef253e33d619af0da3ef3be4c45cb0266b9ef055a3fdc4a8f73d6f41 23487e8ace3bc3606b9801cf34810f14755d192265d39c83b7523603f263177d +test/extractor-tests/generated/Trait/Trait.ql e88ff04557cf050a5acb5038537bb4f7a444c85721eaf3e0aa4c10e7e7724c56 e37b9e60fa8cc64ef9e8db1707d2d8c5a62f9804233c939b4aaa39762b9b0a9a 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_getCanonicalPath.ql 2ff57c8006af1e2d2746d83f8500f5fec109548443677dbb2627ff9b9cbcaf82 2f48643287bfe8081930521cc0282b2a27e62bd9c332971ca8dd6b2c007fe05f test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql d8433d63bb2c4b3befaaedc9ce862d1d7edcdf8b83b3fb5529262fab93880d20 3779f2678b3e00aac87259ecfe60903bb564aa5dbbc39adc6c98ad70117d8510 +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 60759837be5e02f15e2d994fc601be1bb05b0508378b49c010764e5fd451bec0 71d5e24233d89af721a13fc968d2c21f2ac55f7c2e1601a4d26e5fbd59d12db0 +test/extractor-tests/generated/TraitAlias/TraitAlias.ql 8870048164ba3c3ea8d4c10e5793d860a4ed3ef0890bf32409827321ddde4b72 9a912ebba80977656e74e1d94478c193164684f01371e23f09817231b58007ff test/extractor-tests/generated/TraitAlias/TraitAlias_getAttr.ql 128c24196bfa6204fffd4154ff6acebd2d1924bb366809cdb227f33d89e185c8 56e8329e652567f19ef7d4c4933ee670a27c0afb877a0fab060a0a2031d8133e -test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.ql f8491de4aa92f5d5f0ad4b91625f60a8d53eb3a02893b7f468dcf1e9065492a2 d2fad385018764ad9f962e1ec8e98b20286d4c2188ba975e5ec96b24cf747a6e test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql 303212122021da7f745050c5de76c756461e5c6e8f4b20e26c43aa63d821c2b6 fdbd024cbe13e34265505147c6faffd997e5c222386c3d9e719cd2a385bde51c +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 test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql 9ab4c329b25ea5e1a899b8698093f404ee9c095f0b0e38011161ca6480cd10a7 95c3b93610cdc08a0e251ab1307523f8cfb5560460923c81aace8619e30746dd @@ -1080,10 +1080,10 @@ test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088 test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117 test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4 -test/extractor-tests/generated/TypeAlias/TypeAlias.ql d9afc4b73a94a025cfc3be9431689ad95e26b305b511511d5b263804a8230557 2521cb5a3be030d7b32b8083247df414e0fe31ab808664e7a2224450f75eff7a +test/extractor-tests/generated/TypeAlias/TypeAlias.ql 87645d4aa0e2c789dfd7111c6150e72c65b2e108b371bb5fc247aa8d34a25893 6335b4e56d998eed57d8f026d2d1dbfc018754e87c755e1194a2ef9f7a468233 test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382 -test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.ql b0872bf645d780a2d3fa048b0e9958acab8453e177f571512e1f7963c466f5e0 c60a61b71f691132ffcc88d67038d7cdb0df5dee9940321f6e084845dd82e91d test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql cd66db5b43bcb46a6cf6db8c262fd524017ef67cdb67c010af61fab303e3bc65 2aebae618448530ec537709c5381359ea98399db83eeae3be88825ebefa1829d +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 test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql c4d56678981c78cd839b203dbd4a02dd30144db83329fb0015e90cf6c6138757 f9626eee79ce10727c6f13ed6a4819eb7da32827357a52939afaf4e71419af33 @@ -1105,19 +1105,19 @@ 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 53b53f033e7f5195565be3aea387d9d2acad9582acd18ec342c785ceb8705775 ee713cb6cd160455e5af5906d17bc30386556cbe3d113bc744c411eef17934fd +test/extractor-tests/generated/Union/Union.ql 1049e542ca7723490d05e20b5a7a5867f74a5126395f333eae512aeb05efefd6 1f1cd82337e7ade9d02d16123201bbff62983c537672b5c1babfe6b65d300e82 test/extractor-tests/generated/Union/Union_getAttr.ql 42fa0878a6566208863b1d884baf7b68b46089827fdb1dbbfacbfccf5966a9a2 54aa94f0281ca80d1a4bdb0e2240f4384af2ab8d50f251875d1877d0964579fc -test/extractor-tests/generated/Union/Union_getCanonicalPath.ql a08fb3f3305be82ffca880bd66b6b938783b23d5d4ef5f404f79df27c306fa8f c435480ae375a559b02c1a459c04a95e7aaab617cf5168c14f634946bccdb1dc test/extractor-tests/generated/Union/Union_getCrateOrigin.ql c218308cf17b1490550229a725542d248617661b1a5fa14e9b0e18d29c5ecc00 e0489242c8ff7aa4dbfdebcd46a5e0d9bea0aa618eb0617e76b9b6f863a2907a +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_getRecordFieldList.ql ded2890094adaa627be35f2a8335abbe5c1d4b5dcf1671f09f504546148cc02e 1f0d94a5c3259b8c39f2a78f1f9250655c6183a5277131a7f3de14126eee6d03 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 948325f4e38a2f213b391d5c2f3ebec59415e1acd220bde1354e11b8071c8bd9 a770745dcbe09dfb414772dbd51ec9405d6d69b772cd189140c6e4b20a43bf0f +test/extractor-tests/generated/Use/Use.ql b20f6221e6ee731718eb9a02fa765f298ad285f23393a3df0119707c48edd8b3 9ab45d9b3c51c6181a6609b72ebd763c336fee01b11757e7f044257510bd7f3f test/extractor-tests/generated/Use/Use_getAttr.ql 6d43c25401398108553508aabb32ca476b3072060bb73eb07b1b60823a01f964 84e6f6953b4aa9a7472082f0a4f2df26ab1d157529ab2c661f0031603c94bb1d -test/extractor-tests/generated/Use/Use_getCanonicalPath.ql 091e3cd46980ed847b9b2716ae53da0c62da7f3d5a040c112c77639bbd7f7335 924893d23c76c1c21228d5083a34991c40146f2f67be26e2648b7e33e2e3785d test/extractor-tests/generated/Use/Use_getCrateOrigin.ql 912ebc1089aa3390d4142a39ea73d5490eae525d1fb51654fdd05e9dd48a94b6 c59e36362016ae536421e6d517889cea0b2670818ea1f9e997796f51a9b381e2 +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 test/extractor-tests/generated/UseTree/UseTree.ql cb9f63051ae08cf8557b86b69b02cefe1732fc1e2daec34bcb891e271829cd86 eb46496aab9252b21eb0ccdd75792a97264885259c23d7e17e3013d943783947 diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes index 5ab2bc146fe0..2d19334cbc73 100644 --- a/rust/ql/.gitattributes +++ b/rust/ql/.gitattributes @@ -693,8 +693,8 @@ /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_getBody.ql linguist-generated -/test/extractor-tests/generated/Const/Const_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Const/Const_getCrateOrigin.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_getTy.ql linguist-generated /test/extractor-tests/generated/Const/Const_getVisibility.ql linguist-generated @@ -714,8 +714,8 @@ /test/extractor-tests/generated/DynTraitType/DynTraitType_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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Enum/Enum_getCrateOrigin.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 /test/extractor-tests/generated/Enum/Enum_getVariantList.ql linguist-generated @@ -726,13 +726,13 @@ /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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql linguist-generated +/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql linguist-generated /test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql linguist-generated /test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql linguist-generated /test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql linguist-generated @@ -767,8 +767,8 @@ /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_getBody.ql linguist-generated -/test/extractor-tests/generated/Function/Function_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Function/Function_getCrateOrigin.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 /test/extractor-tests/generated/Function/Function_getParamList.ql linguist-generated @@ -791,8 +791,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Impl/Impl_getCrateOrigin.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 /test/extractor-tests/generated/Impl/Impl_getTrait.ql linguist-generated @@ -841,17 +841,17 @@ /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_getCanonicalPath.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_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_getBody.ql linguist-generated -/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.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 /test/extractor-tests/generated/MacroExpr/MacroExpr.ql linguist-generated @@ -862,8 +862,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.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 /test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql linguist-generated @@ -898,8 +898,8 @@ /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Module/Module_getCrateOrigin.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 /test/extractor-tests/generated/Module/Module_getVisibility.ql linguist-generated @@ -1022,8 +1022,8 @@ /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_getBody.ql linguist-generated -/test/extractor-tests/generated/Static/Static_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Static/Static_getCrateOrigin.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_getTy.ql linguist-generated /test/extractor-tests/generated/Static/Static_getVisibility.ql linguist-generated @@ -1033,8 +1033,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Struct/Struct_getCrateOrigin.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 /test/extractor-tests/generated/Struct/Struct_getName.ql linguist-generated @@ -1047,8 +1047,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Trait/Trait_getCrateOrigin.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 /test/extractor-tests/generated/Trait/Trait_getTypeBoundList.ql linguist-generated @@ -1056,8 +1056,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.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 /test/extractor-tests/generated/TraitAlias/TraitAlias_getTypeBoundList.ql linguist-generated @@ -1084,8 +1084,8 @@ /test/extractor-tests/generated/TupleType/TupleType_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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.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 /test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql linguist-generated @@ -1109,8 +1109,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Union/Union_getCrateOrigin.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 /test/extractor-tests/generated/Union/Union_getRecordFieldList.ql linguist-generated @@ -1118,8 +1118,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_getCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Use/Use_getCrateOrigin.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 /test/extractor-tests/generated/UseTree/UseTree.ql linguist-generated diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll index 2b82c0c08ec6..429221c7f18f 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll @@ -23,18 +23,22 @@ module Generated { */ class Item extends Synth::TItem, StmtImpl::Stmt { /** - * Gets the canonical path of this item, if it exists. + * Gets the extended canonical path of this item, if it exists. * - * See https://doc.rust-lang.org/reference/paths.html#canonical-paths. + * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths), + * or `{}::name` for addressable items defined in an anonymous block (and only + * addressable there-in). + * INTERNAL: Do not use. */ - string getCanonicalPath() { - result = Synth::convertItemToRaw(this).(Raw::Item).getCanonicalPath() + string getExtendedCanonicalPath() { + result = Synth::convertItemToRaw(this).(Raw::Item).getExtendedCanonicalPath() } /** - * Holds if `getCanonicalPath()` exists. + * Holds if `getExtendedCanonicalPath()` exists. + * INTERNAL: Do not use. */ - final predicate hasCanonicalPath() { exists(this.getCanonicalPath()) } + final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) } /** * Gets the crate origin of this item, if it exists. diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll index 8514a624ee60..29be5f96117b 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll @@ -2060,11 +2060,13 @@ module Raw { */ class Item extends @item, Stmt { /** - * Gets the canonical path of this item, if it exists. + * Gets the extended canonical path of this item, if it exists. * - * See https://doc.rust-lang.org/reference/paths.html#canonical-paths. + * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths), + * or `{}::name` for addressable items defined in an anonymous block (and only + * addressable there-in). */ - string getCanonicalPath() { item_canonical_paths(this, result) } + string getExtendedCanonicalPath() { item_extended_canonical_paths(this, result) } /** * Gets the crate origin of this item, if it exists. diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme index 0b9277d3597c..d5d61e69a94a 100644 --- a/rust/ql/lib/rust.dbscheme +++ b/rust/ql/lib/rust.dbscheme @@ -1844,9 +1844,9 @@ infer_types( ; #keyset[id] -item_canonical_paths( +item_extended_canonical_paths( int id: @item ref, - string canonical_path: string ref + string extended_canonical_path: string ref ); #keyset[id] diff --git a/rust/ql/test/extractor-tests/canonical_name/canonical_name.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_path.expected similarity index 57% rename from rust/ql/test/extractor-tests/canonical_name/canonical_name.expected rename to rust/ql/test/extractor-tests/canonical_path/canonical_path.expected index 176db21bef84..abfa4a99802a 100644 --- a/rust/ql/test/extractor-tests/canonical_name/canonical_name.expected +++ b/rust/ql/test/extractor-tests/canonical_path/canonical_path.expected @@ -10,15 +10,19 @@ | canonical_paths.rs:17:9:17:20 | h | crate::canonical_paths::a::TraitWithBlanketImpl::h | | canonical_paths.rs:20:5:22:5 | Impl | None | | canonical_paths.rs:21:9:21:22 | h | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h | -| canonical_paths.rs:25:1:45:1 | Module | crate::canonical_paths::without | -| canonical_paths.rs:26:5:44:5 | canonicals | crate::canonical_paths::without::canonicals | -| canonical_paths.rs:27:9:27:27 | Struct | None | -| canonical_paths.rs:29:9:31:9 | Trait | None | -| canonical_paths.rs:30:13:30:24 | g | None | +| canonical_paths.rs:25:1:53:1 | Module | crate::canonical_paths::without | +| canonical_paths.rs:26:5:48:5 | canonicals | crate::canonical_paths::without::canonicals | +| canonical_paths.rs:27:9:27:27 | Struct | {0}::OtherStruct | +| canonical_paths.rs:29:9:31:9 | Trait | {0}::OtherTrait | +| canonical_paths.rs:30:13:30:24 | g | {0}::OtherTrait::g | | canonical_paths.rs:33:9:35:9 | Impl | None | -| canonical_paths.rs:34:13:34:26 | g | None | +| canonical_paths.rs:34:13:34:26 | g | <{0}::OtherStruct as {0}::OtherTrait>::g | | canonical_paths.rs:37:9:39:9 | Impl | None | -| canonical_paths.rs:38:13:38:26 | g | None | +| canonical_paths.rs:38:13:38:26 | g | ::g | | canonical_paths.rs:41:9:43:9 | Impl | None | -| canonical_paths.rs:42:13:42:26 | f | None | +| canonical_paths.rs:42:13:42:26 | f | <{0}::OtherStruct as crate::canonical_paths::a::Trait>::f | +| canonical_paths.rs:45:9:47:9 | nested | {0}::nested | +| canonical_paths.rs:46:13:46:31 | Struct | {1}::OtherStruct | +| canonical_paths.rs:50:5:52:5 | other | crate::canonical_paths::without::other | +| canonical_paths.rs:51:9:51:27 | Struct | {2}::OtherStruct | | lib.rs:1:1:1:20 | Module | crate::canonical_paths | diff --git a/rust/ql/test/extractor-tests/canonical_name/canonical_name.ql b/rust/ql/test/extractor-tests/canonical_path/canonical_path.ql similarity index 53% rename from rust/ql/test/extractor-tests/canonical_name/canonical_name.ql rename to rust/ql/test/extractor-tests/canonical_path/canonical_path.ql index 9a68041cf5ee..5548ba977737 100644 --- a/rust/ql/test/extractor-tests/canonical_name/canonical_name.ql +++ b/rust/ql/test/extractor-tests/canonical_path/canonical_path.ql @@ -5,8 +5,8 @@ from Item i, string path where toBeTested(i) and ( - path = i.getCanonicalPath() + path = i.getExtendedCanonicalPath() or - not i.hasCanonicalPath() and path = "None" + not i.hasExtendedCanonicalPath() and path = "None" ) select i, path diff --git a/rust/ql/test/extractor-tests/canonical_name/canonical_paths.rs b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs similarity index 86% rename from rust/ql/test/extractor-tests/canonical_name/canonical_paths.rs rename to rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs index fc11b443ef82..39a5d8672b3b 100644 --- a/rust/ql/test/extractor-tests/canonical_name/canonical_paths.rs +++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs @@ -41,5 +41,13 @@ mod without { impl crate::canonical_paths::a::Trait for OtherStruct { fn f(&self) {} } + + fn nested() { + struct OtherStruct; + } + } + + fn other() { + struct OtherStruct; } } diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql index c484e553219d..125943f40a04 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const.ql +++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql @@ -3,12 +3,17 @@ import codeql.rust.elements import TestUtils from - Const x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasBody, - string isConst, string isDefault, string hasName, string hasTy, string hasVisibility + Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + string hasBody, string isConst, string isDefault, string hasName, string hasTy, + string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -17,6 +22,6 @@ where (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasTy() then hasTy = "yes" else hasTy = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Const/Const_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Const/Const_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql index ca35b81c3563..c11c4e0856d7 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Const x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql index 58bd905825f3..3468056c072b 100644 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql +++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - Enum x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + Enum x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasVariantList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -17,7 +21,7 @@ where (if x.hasVariantList() then hasVariantList = "yes" else hasVariantList = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVariantList:", hasVariantList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Enum/Enum_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Enum/Enum_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql index cee285ae0920..fa456ecd9d03 100644 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Enum x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql index 3d83398bfa9e..3d58a4714123 100644 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql +++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql @@ -3,17 +3,21 @@ import codeql.rust.elements import TestUtils from - ExternBlock x, string hasCanonicalPath, string hasCrateOrigin, string hasAbi, + ExternBlock x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAbi, int getNumberOfAttrs, string hasExternItemList, string isUnsafe where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "hasAbi:", - hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasExternItemList:", hasExternItemList, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, + "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, "hasExternItemList:", hasExternItemList, "isUnsafe:", isUnsafe diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql index 54923d7dbb4e..f0bd607a179a 100644 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from ExternBlock x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql index e1edf98797b0..547a20808643 100644 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql +++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql @@ -3,17 +3,21 @@ import codeql.rust.elements import TestUtils from - ExternCrate x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasNameRef, string hasRename, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and (if x.hasRename() then hasRename = "yes" else hasRename = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasRename:", hasRename, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql index 1ef1af7c81d2..15959426eed0 100644 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from ExternCrate x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected index 51282e23ea24..f93eb58b2ae4 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function.expected +++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected @@ -1,2 +1,2 @@ -| gen_function.rs:3:1:4:38 | foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasCanonicalPath: | yes | hasCrateOrigin: | yes | 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 | bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasCanonicalPath: | yes | hasCrateOrigin: | yes | 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:3:1:4:38 | foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | 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 | bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no | diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql index 5800da167e3c..a6e969111fb9 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function.ql +++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql @@ -3,7 +3,7 @@ import codeql.rust.elements import TestUtils from - Function x, string hasParamList, int getNumberOfAttrs, string hasCanonicalPath, + Function x, string hasParamList, int getNumberOfAttrs, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAbi, string hasBody, string hasGenericParamList, string isAsync, string isConst, string isDefault, string isGen, string isUnsafe, string hasName, string hasRetType, string hasVisibility, string hasWhereClause @@ -12,7 +12,11 @@ where not x.isUnknown() and (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -26,8 +30,9 @@ where (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs, "hasCanonicalPath:", - hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "hasAbi:", hasAbi, "hasBody:", hasBody, - "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst, - "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, "hasName:", hasName, - "hasRetType:", hasRetType, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause +select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs, + "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, + "hasAbi:", hasAbi, "hasBody:", hasBody, "hasGenericParamList:", hasGenericParamList, "isAsync:", + isAsync, "isConst:", isConst, "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, + "hasName:", hasName, "hasRetType:", hasRetType, "hasVisibility:", hasVisibility, + "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Function/Function_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/Function/Function_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql index e89d26f15eb2..f2c413748de6 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Function x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql index 64b23d4da8c0..5af0d0da0d44 100644 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql +++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - Impl x, string hasCanonicalPath, string hasCrateOrigin, string hasAssocItemList, + Impl x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isConst, string isDefault, string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and @@ -21,7 +25,7 @@ where (if x.hasTrait() then hasTrait = "yes" else hasTrait = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isConst:", isConst, "isDefault:", isDefault, "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait, "hasVisibility:", diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Impl/Impl_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Impl/Impl_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql index d6472f9faf92..140490fcaff3 100644 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Impl x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected index 038ddc3a52a6..03bcc247a9d2 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected @@ -1 +1 @@ -| gen_macro_call.rs:5:5:5:11 | MacroCall | hasCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes | +| gen_macro_call.rs:5:5:5:11 | MacroCall | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes | diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql index 96f95d5e085d..56044c127c26 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql @@ -3,17 +3,21 @@ import codeql.rust.elements import TestUtils from - MacroCall x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasPath, - string hasTokenTree, string hasExpanded + MacroCall x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + string hasPath, string hasTokenTree, string hasExpanded where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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") and if x.hasExpanded() then hasExpanded = "yes" else hasExpanded = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, "hasTokenTree:", hasTokenTree, "hasExpanded:", hasExpanded diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql index bb93fbca8979..0fffb4f4384e 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from MacroCall x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql index ff9f6a2402a5..957d5b9ea9ee 100644 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql +++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql @@ -3,18 +3,22 @@ import codeql.rust.elements import TestUtils from - MacroDef x, string hasCanonicalPath, string hasCrateOrigin, string hasArgs, int getNumberOfAttrs, - string hasBody, string hasName, string hasVisibility + MacroDef x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasArgs, + int getNumberOfAttrs, string hasBody, string hasName, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "hasArgs:", - hasArgs, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:", hasName, - "hasVisibility:", hasVisibility +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, + "hasArgs:", hasArgs, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "hasName:", + hasName, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql index ecf2dd2c24cb..c30de43e669c 100644 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from MacroDef x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql index 33ee04665c91..7bdc462c01cd 100644 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql +++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql @@ -3,17 +3,21 @@ import codeql.rust.elements import TestUtils from - MacroRules x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + MacroRules x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasName, string hasTokenTree, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTokenTree:", hasTokenTree, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql index be2591d73b4c..b2fa0cc9f7e9 100644 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from MacroRules x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected index 10f54f5496a7..d7c04f7c1180 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module.expected +++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected @@ -1,3 +1,3 @@ -| gen_module.rs:3:1:4:8 | Module | hasCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | -| gen_module.rs:5:1:7:1 | Module | hasCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no | -| lib.rs:1:1:1:15 | Module | hasCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | +| gen_module.rs:3:1:4:8 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | +| gen_module.rs:5:1:7:1 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no | +| lib.rs:1:1:1:15 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql index 46e89dcf8dd5..a33b7daa8954 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module.ql +++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql @@ -3,17 +3,21 @@ import codeql.rust.elements import TestUtils from - Module x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + Module x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasItemList, string hasName, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasItemList:", hasItemList, "hasName:", hasName, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Module/Module_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/Module/Module_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql index 739c7333e99f..9c810fe65c67 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Module x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql index 716e5399f0fa..7450b7778a10 100644 --- a/rust/ql/test/extractor-tests/generated/Static/Static.ql +++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql @@ -3,12 +3,16 @@ import codeql.rust.elements import TestUtils from - Static x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasBody, - string isMut, string isStatic, string hasName, string hasTy, string hasVisibility + Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + string hasBody, string isMut, string isStatic, string hasName, string hasTy, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -17,6 +21,6 @@ where (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasTy() then hasTy = "yes" else hasTy = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:", isMut, "isStatic:", isStatic, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Static/Static_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/Static/Static_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql index f4ee3ee90697..32b3a0c127e1 100644 --- a/rust/ql/test/extractor-tests/generated/Static/Static_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Static x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql index 924cb99b3b22..d2b3a349386c 100644 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql +++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - Struct x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + Struct x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasFieldList, string hasGenericParamList, string hasName, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and @@ -17,7 +21,7 @@ where (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasFieldList:", hasFieldList, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Struct/Struct_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/Struct/Struct_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql index 59cda44eff73..f502a347b3e7 100644 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Struct x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected index 46021610f8eb..ba06219a2d4c 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected @@ -1,2 +1,2 @@ -| gen_trait.rs:3:1:8:1 | Trait | hasCanonicalPath: | yes | hasCrateOrigin: | yes | 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 | hasCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes | +| gen_trait.rs:3:1:8:1 | Trait | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | 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 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes | diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql index fd7b3af4909c..b4548cddceee 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - Trait x, string hasCanonicalPath, string hasCrateOrigin, string hasAssocItemList, + Trait x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isAuto, string isUnsafe, string hasName, string hasTypeBoundList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and @@ -20,7 +24,7 @@ where (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isAuto:", isAuto, "isUnsafe:", isUnsafe, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Trait/Trait_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Trait/Trait_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql index 96b8ef582c90..5281a18656bd 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Trait x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql index 0d442d7608fe..80fe86e27493 100644 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - TraitAlias x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + TraitAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasTypeBoundList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -17,7 +21,7 @@ where (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql index 90ae62e9f861..6326e730c331 100644 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from TraitAlias x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql index 9a8e17011816..5959301f81a4 100644 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - TypeAlias x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasGenericParamList, string isDefault, string hasName, string hasTy, string hasTypeBoundList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -19,7 +23,7 @@ where (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isDefault:", isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql similarity index 78% rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql index a9a00151f764..1f99c7595567 100644 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from TypeAlias x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql index 29e340a5b902..0f0e0872d9d9 100644 --- a/rust/ql/test/extractor-tests/generated/Union/Union.ql +++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql @@ -3,13 +3,17 @@ import codeql.rust.elements import TestUtils from - Union x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + Union x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasRecordFieldList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -17,7 +21,7 @@ where (if x.hasRecordFieldList() then hasRecordFieldList = "yes" else hasRecordFieldList = "no") and (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -select x, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasRecordFieldList:", hasRecordFieldList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Union/Union_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Union/Union_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql index 7295625e8cc7..fb20efa8f29e 100644 --- a/rust/ql/test/extractor-tests/generated/Union/Union_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Union x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql index 22eb7b5a52df..b88b3a693322 100644 --- a/rust/ql/test/extractor-tests/generated/Use/Use.ql +++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql @@ -3,15 +3,19 @@ import codeql.rust.elements import TestUtils from - Use x, string hasCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, string hasUseTree, - string hasVisibility + Use x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs, + string hasUseTree, string hasVisibility where toBeTested(x) and not x.isUnknown() and - (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and + ( + if x.hasExtendedCanonicalPath() + then hasExtendedCanonicalPath = "yes" + else hasExtendedCanonicalPath = "no" + ) and (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "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, "hasCanonicalPath:", hasCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, +select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", hasUseTree, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.expected similarity index 100% rename from rust/ql/test/extractor-tests/generated/Use/Use_getCanonicalPath.expected rename to rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.expected diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql similarity index 77% rename from rust/ql/test/extractor-tests/generated/Use/Use_getCanonicalPath.ql rename to rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql index b42749f2c795..64c633c6c7d1 100644 --- a/rust/ql/test/extractor-tests/generated/Use/Use_getCanonicalPath.ql +++ b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql @@ -4,4 +4,4 @@ import TestUtils from Use x where toBeTested(x) and not x.isUnknown() -select x, x.getCanonicalPath() +select x, x.getExtendedCanonicalPath() diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py index 821ba70b0534..f8f5f182ad6f 100644 --- a/rust/schema/annotations.py +++ b/rust/schema/annotations.py @@ -1803,5 +1803,9 @@ class FormatArgument(Locatable): @annotate(Item) class _: - canonical_path: optional[string] | desc("See https://doc.rust-lang.org/reference/paths.html#canonical-paths.") | rust.detach + extended_canonical_path: optional[string] | desc(""" + Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths), + or `{}::name` for addressable items defined in an anonymous block (and only + addressable there-in). + """) | rust.detach | ql.internal crate_origin: optional[string] | desc("One of `rustc:`, `repo::` or `lang:`.") | rust.detach | ql.internal