diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list index 8dca71c7af9..372ccc71a6a 100644 --- a/rust/extractor/src/generated/.generated.list +++ b/rust/extractor/src/generated/.generated.list @@ -1 +1 @@ -mod.rs 19a788ebd1fb0ecd3bb612d29320aefd66b11aea63e85c27884d27b5e01d68b9 19a788ebd1fb0ecd3bb612d29320aefd66b11aea63e85c27884d27b5e01d68b9 +mod.rs d053373b3e6ec84532b8e8db1358b6f641d023ebdb00341a5f71c7bfe7bfd94d d053373b3e6ec84532b8e8db1358b6f641d023ebdb00341a5f71c7bfe7bfd94d diff --git a/rust/extractor/src/generated/mod.rs b/rust/extractor/src/generated/mod.rs index 523845bf57b..74d1b91f2d1 100644 --- a/rust/extractor/src/generated/mod.rs +++ b/rust/extractor/src/generated/mod.rs @@ -246,12 +246,6 @@ pub struct Addressable { } impl Addressable { - pub fn emit_extended_canonical_path(id: trap::Label, value: String, out: &mut trap::Writer) { - out.add_tuple("addressable_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("addressable_crate_origins", vec![id.into(), value.into()]); - } pub fn emit_canonical_path(id: trap::Label, value: trap::Label, out: &mut trap::Writer) { out.add_tuple("addressable_canonical_paths", vec![id.into(), value.into()]); } @@ -2188,12 +2182,6 @@ pub struct Resolvable { } impl Resolvable { - pub fn emit_resolved_path(id: trap::Label, value: String, out: &mut trap::Writer) { - out.add_tuple("resolvable_resolved_paths", vec![id.into(), value.into()]); - } - pub fn emit_resolved_crate_origin(id: trap::Label, value: String, out: &mut trap::Writer) { - out.add_tuple("resolvable_resolved_crate_origins", vec![id.into(), value.into()]); - } pub fn emit_resolved_canonical_path(id: trap::Label, value: trap::Label, out: &mut trap::Writer) { out.add_tuple("resolvable_resolved_canonical_paths", vec![id.into(), value.into()]); } @@ -10651,26 +10639,26 @@ impl From> for trap::Label { } #[derive(Debug)] -pub struct CrateRoot { +pub struct CrateRef { _unused: () } -impl trap::TrapClass for CrateRoot { - fn class_name() -> &'static str { "CrateRoot" } +impl trap::TrapClass for CrateRef { + fn class_name() -> &'static str { "CrateRef" } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme CrateRoot is a subclass of CanonicalPathElement +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme CrateRef is a subclass of CanonicalPathElement unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme CrateRoot is a subclass of Element +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme CrateRef is a subclass of Element unsafe { Self::from_untyped(value.as_untyped()) } @@ -10752,46 +10740,46 @@ impl From> for trap::Label { } #[derive(Debug)] -pub struct LangCrateRoot { - pub id: trap::TrapId, +pub struct LangCrateRef { + pub id: trap::TrapId, pub name: String, } -impl trap::TrapEntry for LangCrateRoot { +impl trap::TrapEntry for LangCrateRef { fn extract_id(&mut self) -> trap::TrapId { std::mem::replace(&mut self.id, trap::TrapId::Star) } fn emit(self, id: trap::Label, out: &mut trap::Writer) { - out.add_tuple("lang_crate_roots", vec![id.into(), self.name.into()]); + out.add_tuple("lang_crate_refs", vec![id.into(), self.name.into()]); } } -impl trap::TrapClass for LangCrateRoot { - fn class_name() -> &'static str { "LangCrateRoot" } +impl trap::TrapClass for LangCrateRef { + fn class_name() -> &'static str { "LangCrateRef" } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme LangCrateRoot is a subclass of CanonicalPathElement +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme LangCrateRef is a subclass of CanonicalPathElement unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme LangCrateRoot is a subclass of CrateRoot +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme LangCrateRef is a subclass of CrateRef unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme LangCrateRoot is a subclass of Element +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme LangCrateRef is a subclass of Element unsafe { Self::from_untyped(value.as_untyped()) } @@ -10849,7 +10837,7 @@ impl From> for trap::Label { #[derive(Debug)] pub struct Namespace { pub id: trap::TrapId, - pub root: trap::Label, + pub root: trap::Label, pub path: String, } @@ -10946,54 +10934,54 @@ impl From> for trap::Label { } #[derive(Debug)] -pub struct RepoCrateRoot { - pub id: trap::TrapId, +pub struct RepoCrateRef { + pub id: trap::TrapId, pub name: Option, pub repo: Option, pub source: trap::Label, } -impl trap::TrapEntry for RepoCrateRoot { +impl trap::TrapEntry for RepoCrateRef { fn extract_id(&mut self) -> trap::TrapId { std::mem::replace(&mut self.id, trap::TrapId::Star) } fn emit(self, id: trap::Label, out: &mut trap::Writer) { - out.add_tuple("repo_crate_roots", vec![id.into(), self.source.into()]); + out.add_tuple("repo_crate_refs", vec![id.into(), self.source.into()]); if let Some(v) = self.name { - out.add_tuple("repo_crate_root_names", vec![id.into(), v.into()]); + out.add_tuple("repo_crate_ref_names", vec![id.into(), v.into()]); } if let Some(v) = self.repo { - out.add_tuple("repo_crate_root_repos", vec![id.into(), v.into()]); + out.add_tuple("repo_crate_ref_repos", vec![id.into(), v.into()]); } } } -impl trap::TrapClass for RepoCrateRoot { - fn class_name() -> &'static str { "RepoCrateRoot" } +impl trap::TrapClass for RepoCrateRef { + fn class_name() -> &'static str { "RepoCrateRef" } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RepoCrateRoot is a subclass of CanonicalPathElement +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RepoCrateRef is a subclass of CanonicalPathElement unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RepoCrateRoot is a subclass of CrateRoot +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RepoCrateRef is a subclass of CrateRef unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RepoCrateRoot is a subclass of Element +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RepoCrateRef is a subclass of Element unsafe { Self::from_untyped(value.as_untyped()) } @@ -11001,46 +10989,46 @@ impl From> for trap::Label { } #[derive(Debug)] -pub struct RustcCrateRoot { - pub id: trap::TrapId, +pub struct RustcCrateRef { + pub id: trap::TrapId, pub name: String, } -impl trap::TrapEntry for RustcCrateRoot { +impl trap::TrapEntry for RustcCrateRef { fn extract_id(&mut self) -> trap::TrapId { std::mem::replace(&mut self.id, trap::TrapId::Star) } fn emit(self, id: trap::Label, out: &mut trap::Writer) { - out.add_tuple("rustc_crate_roots", vec![id.into(), self.name.into()]); + out.add_tuple("rustc_crate_refs", vec![id.into(), self.name.into()]); } } -impl trap::TrapClass for RustcCrateRoot { - fn class_name() -> &'static str { "RustcCrateRoot" } +impl trap::TrapClass for RustcCrateRef { + fn class_name() -> &'static str { "RustcCrateRef" } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RustcCrateRoot is a subclass of CanonicalPathElement +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RustcCrateRef is a subclass of CanonicalPathElement unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RustcCrateRoot is a subclass of CrateRoot +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RustcCrateRef is a subclass of CrateRef unsafe { Self::from_untyped(value.as_untyped()) } } } -impl From> for trap::Label { - fn from(value: trap::Label) -> Self { - // SAFETY: this is safe because in the dbscheme RustcCrateRoot is a subclass of Element +impl From> for trap::Label { + fn from(value: trap::Label) -> Self { + // SAFETY: this is safe because in the dbscheme RustcCrateRef is a subclass of Element unsafe { Self::from_untyped(value.as_untyped()) } diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs index 9c3a84c4d83..65e58213f52 100644 --- a/rust/extractor/src/translate/base.rs +++ b/rust/extractor/src/translate/base.rs @@ -508,7 +508,7 @@ impl<'a> Translator<'a> { }) } - fn emit_crate_root(&mut self, item: Crate) -> Option> { + fn emit_crate_root(&mut self, item: Crate) -> Option> { cache_get_or_assign!(self.canonical_path_cache, item, { let db = self.semantics.unwrap().db; let (repo, name) = match item.origin(db) { @@ -519,7 +519,7 @@ impl<'a> Translator<'a> { let name = it.to_string(); return Some( self.trap - .emit(generated::LangCrateRoot { + .emit(generated::LangCrateRef { id: trap_key!(name), name, }) @@ -536,7 +536,7 @@ impl<'a> Translator<'a> { let source = self.trap.emit_file(&PathBuf::from(file.as_os_str())); Some( self.trap - .emit(generated::RepoCrateRoot { + .emit(generated::RepoCrateRef { id: trap_key!(source, name, repo), name, repo, diff --git a/rust/extractor/src/translate/label_cache.rs b/rust/extractor/src/translate/label_cache.rs index 1e5e49c8cc8..9f41406a621 100644 --- a/rust/extractor/src/translate/label_cache.rs +++ b/rust/extractor/src/translate/label_cache.rs @@ -88,7 +88,7 @@ impl StorableAsModuleItemCanonicalPath for Struct { } impl StorableAsCanonicalPath for Crate { - type TrapClass = generated::CrateRoot; + type TrapClass = generated::CrateRef; fn to_key(&self) -> Key { Key::Crate(*self) diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list index 756a5375d9f..8364820ba39 100644 --- a/rust/ql/.generated.list +++ b/rust/ql/.generated.list @@ -177,15 +177,15 @@ lib/codeql/rust/elements/canonical_paths/CanonicalPath.qll b560482aefdc6206bec91 lib/codeql/rust/elements/canonical_paths/CanonicalPathElement.qll 8dd4ad94281238cfad2ffc69b5115c05076c998f4b46cff0cdafd0cc00e1c49b 274274bcd55f79fbb1af5e5d34be9a59e1e0baf37298f7d3a8541e8a116ffba8 lib/codeql/rust/elements/canonical_paths/ConcreteTypeCanonicalPath.qll 720734f277ae81ea6a2c07af8ddc5a8b00aa5ff3ee008e8ab9c7bcef0b974fcc ffbe408309847a5d57b1e83504d192756a58af945b758c812e4cb98280af68ec lib/codeql/rust/elements/canonical_paths/ConstGenericTypeArg.qll c20adef6f5dce4707c3eae6d62c1c5fec504479c12698f8772bc9a47de862204 dde369301c39faf01773704b29863257c87577015c21da8f4cb360d6799a0cc2 -lib/codeql/rust/elements/canonical_paths/CrateRoot.qll 4f2507009d8db33506ba1afa8c7dd7632cbe97701a88e3f17fc5de5182b0d549 0110738a63deb881c009d239f901b73975b94a316fbcb0776256f0750251e756 +lib/codeql/rust/elements/canonical_paths/CrateRef.qll d8477ae2c6b3509304f09f6654b27c365bf6521f92616571a0fa3d3c3fb84cb9 7a4bd96a62174f2931d6ac8c2cb78c2932d4518795936bcdf7ef13fd54c354ea lib/codeql/rust/elements/canonical_paths/DerivedTypeCanonicalPath.qll 74d633f843d4370a5b138bdd1dd055299f34bf4a35d4b5aff3b3989e03902fdd 2e59fcca32927ef0dceb07b882636abb93c3391f8ce00859b3866ab63b255e1c -lib/codeql/rust/elements/canonical_paths/LangCrateRoot.qll 188e595753552bfd434181292df01e14c44ddc3f12947b43a681b6141997870b dfe218d86045807faec5e631269da45a91c87ddb363cf81224e88a0d2f017745 +lib/codeql/rust/elements/canonical_paths/LangCrateRef.qll 46883e818e02c8044ce0aec6690ec4ace7a2623c787b47187d23ab1d17acac99 6a7b570ce9909f198fa7dbda9c2a34b133346c0de576e2d04949be5682457f47 lib/codeql/rust/elements/canonical_paths/ModuleItemCanonicalPath.qll a2c1de98457b46e7b23ce883a4f7d89ad568916bcd1f9b952b5c533ebacf4300 4baeb47b9a5ce63fe038414f922056aa4e54f684d33c5348072218a121259925 -lib/codeql/rust/elements/canonical_paths/Namespace.qll 614db7696ed96b7d52b590bc4700b78ee1ce00ca2c17635b595c296a1798191d 0ee32b32079405349c305bbe77181fc31e18f5d6c877f5d375d5f6ec963a9996 +lib/codeql/rust/elements/canonical_paths/Namespace.qll 697215274278c7be4ae05aaff5aed6b0295939223f61f15bc0a9bf5c24a5883e 4ecad978ea9f07754481f2d307272bd543abb2be406a8767ac37b9fc6b75254c lib/codeql/rust/elements/canonical_paths/ParametrizedCanonicalPath.qll a22d55c98080b4b4f0db8882ff942919394b709e4b611b1107b0ab6f6d6968ab d2d72ed915d2eb1485762644d34193093e7ed525cb63eb9cbfa082135bb1108f lib/codeql/rust/elements/canonical_paths/PlaceholderTypeCanonicalPath.qll ff1be7f5267ceccf40d286c19b4b7933d625cff1bc992c4bbd7d8ca9e584ce93 b89e3bec9d3e2baecd7e76852688f9926b63a0006662778484e139fe2dec10f5 -lib/codeql/rust/elements/canonical_paths/RepoCrateRoot.qll d2ef85b33579a72b019dd234ed9ce5ec76e49e064579ccbfc1e13f5a3294dfbc 3f0f7581fb6cfc9cd77e415df5404a8ccd732208c20707392423884836d2b007 -lib/codeql/rust/elements/canonical_paths/RustcCrateRoot.qll 3fe51507ac4ef92530a5538ac1b425a0b53b9e2d010a7c71997e8a86e5a99647 a29988f27653863050494a4405c0f1e839e95e003993f96125019e64553767e2 +lib/codeql/rust/elements/canonical_paths/RepoCrateRef.qll a71260681908504abaa272e7ef0b82aef6c40d7bd1edf45feb55b67370e6d7d0 650461bc0bdaf121f8d3617e596c45019719e599724c19712e7879c399348c3e +lib/codeql/rust/elements/canonical_paths/RustcCrateRef.qll a360a20c6afd3a4469248523d3ea23dcb3f6678542e4bdf69356e58b19155990 c41c2530b0db33b568c1ea279a5e1b102d31632540b8d2cb70d56a945c2e8a03 lib/codeql/rust/elements/canonical_paths/TraitImplItemCanonicalPath.qll c0a645274554605e53df715df9e4c8900118463a252892a7e88633b378ceddae 1c906216e8afd03414ea47888fe1b33c2c57fac8fcc1f0230334fae3808b43ba lib/codeql/rust/elements/canonical_paths/TypeCanonicalPath.qll 510f0c11ca8ac95ee8be57a0be18d2e7ce6350d8ab966e14eeb5a878d1acc781 ae68660f4f24f6426cdf32eeae065fe32d82d1ddece356b10cbbd5579a81e45a lib/codeql/rust/elements/canonical_paths/TypeGenericArg.qll 551e5bce7b474ff097dedfe80e52ca0b3808bda3c855961daddd0ecf36f67aef f3ac937ce08484edab04f285e459c77aac4552e8513b7ee124653aafdb3ceffc @@ -196,14 +196,15 @@ lib/codeql/rust/elements/canonical_paths/internal/BuiltinTypeCanonicalPathConstr lib/codeql/rust/elements/canonical_paths/internal/BuiltinTypeCanonicalPathImpl.qll 6dbc6981e280717eb8a7cc2bf06bb91e760cc168e262dcf87db53f610b3a0362 ce81251f033173baabcfa9dd2a6a760169015329daac738760bb4e6689c0fe85 lib/codeql/rust/elements/canonical_paths/internal/ConcreteTypeCanonicalPathConstructor.qll 122781ed5b5bfddc0f6c5243d3a77eb969559115c7f612b81291f62b5790b48d 348ee1d8c92b803a1aaf8e3fc5a9061a41cd2a4c6f2f6fa51910659a1edfa00f lib/codeql/rust/elements/canonical_paths/internal/ConstGenericTypeArgConstructor.qll a2ef92745e712b091367e063662e800b8f84efdf28b02e7116c7c8ab0629e0fc 4a2689f585c0de2f77ca64620bb65986bafab6209fbc383646335040d6155018 +lib/codeql/rust/elements/canonical_paths/internal/CrateRefImpl.qll 2ee10df29ad819573586e12def0bc4dfe3eb4cf57e2c414ff2d606fb1833b6be 366fe98f3a11ead09aea9aa78b15f4392da641d4ba93a1661bcf0a4816b145d5 lib/codeql/rust/elements/canonical_paths/internal/DerivedTypeCanonicalPathConstructor.qll 1127f0e1eaed5da946a5288271f679ef1984d984a3686cd59d9ec89a8251a234 04419a1231179c8d39637edd443c4ff038e010753f4e6a016ac8c9dbc8f6cccd -lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootConstructor.qll 44b7353025ff44d85dc66e7998736bb94010be1c3ddec6f0e0d8500f89c131df e2cedd482d74cb66ef08a5cbfe9affe25d89d62496260ee5c3e3261cdef02464 +lib/codeql/rust/elements/canonical_paths/internal/LangCrateRefConstructor.qll 068e498ca6e1f0847ad08705e5904a3d1cee9646da3e71e64c565e98bf5de0b8 3a629031633c1f31537ac563e3c3da488dc7e657e20765c6fee0457518075089 lib/codeql/rust/elements/canonical_paths/internal/ModuleItemCanonicalPathConstructor.qll fc580aff51cf598ecfc61a8476044c69800d1bbc41ce5a7ddf1c773d9c20c5db 03ca4ddd5703f2c98609044f76d63c36607b59f25e1e21137818ca7291bb5baf lib/codeql/rust/elements/canonical_paths/internal/NamespaceConstructor.qll 31a7578929de91094425f88d5739a5264c17986e2a00b117075f329cbbef79b6 faf500f1e2a1b04d0bd949d32a639c8713052813cde33aa9cbd691b34a802aac lib/codeql/rust/elements/canonical_paths/internal/ParametrizedCanonicalPathConstructor.qll b9e0bd9380f998e6d7bfbc7d94bdfbfb6d38807bb9e16272c79456725789ee45 c91ac59709ab9f8c4b14d611e532b950479cd4652b6fcde140489b15b19b8a0d lib/codeql/rust/elements/canonical_paths/internal/PlaceholderTypeCanonicalPathConstructor.qll 8c746f1b034a1f88eaa17244669d87891234a4149ce01139f2485a173802ce93 9d7317406fb9112998bee96f90cec9fbfb24f57497d0ea769e9e944c2aaeddd3 -lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootConstructor.qll 99817342db732e1d66d69dc8eb683ce64cd55ad16913e22236a718fa611ba399 5168ad70d3c7cdf4c06dffa1f5fdedff7d522be0349232a9b15dbfc0b75b9ac5 -lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootConstructor.qll 8e40b20cdd8d3a61c80d2f8832fd9ebaac92753e69a5a5ee658f89e2b3917ba3 8cb3d788e0a26d00e6785f0626a8aee4c3bd98993b0aac20f057c6a5abab8027 +lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRefConstructor.qll 215cdb759bf908392e89bde7dd0e8e82b7c6028ecaf3e8844b4a89e0188f86de 8ae1500a7d5c91f6af919148f525c14defc2c71ef825f095d011785471549317 +lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRefConstructor.qll 7504c2625ce3cf33abdb120767926f413caa53275ccc97d5331b549e838e1e50 c183b8846b791404b14a11a3f9d973827747cece903101d1b21b12a56e164b03 lib/codeql/rust/elements/canonical_paths/internal/TraitImplItemCanonicalPathConstructor.qll 4548d2fb262c646ff2eb0409390b9360bcec2bd4a9b594817129f84b6215f362 3d593cf26f40379dda22bb449d05c53c12dad74c06ca4beec1fc59c50362ea67 lib/codeql/rust/elements/canonical_paths/internal/TypeCanonicalPathImpl.qll a6c0228c980b0e8874ccc8d278b4f2938db94ff6a40f065ba2fca5ea012682c6 6a0e7c9d0ea701b605aa19f71f6eeb928e1ab4df9b1961b337ad56e02e36a599 lib/codeql/rust/elements/canonical_paths/internal/TypeGenericTypeArgConstructor.qll dcc4210aa0ed7c2aadd8dfb1f343b29cdf4cfd8d54bddd4424b90f97eac18bf4 b5ce26d604c7e84f27f5981b45b0462e7746089c29522e13ca481e388503d446 @@ -453,7 +454,7 @@ lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d lib/codeql/rust/elements/internal/generated/Abi.qll 87e1ea6b2a8ebf60e1c69176632740e4e27fc56c3f173939b098ba376562b5fa 94b2121e71c4ec94d53a79f972c05a8484ef0d80ed638f53031e7cf4dc5343d5 -lib/codeql/rust/elements/internal/generated/Addressable.qll 4dc477969dd7e001bc0dac829ba96f96f6d7f216f8297e8cc1ea91f819909c5f 8856061f862168d9884fc16d9b11ccb7e7ca3d801b295318083117e0e35f6042 +lib/codeql/rust/elements/internal/generated/Addressable.qll f441fd5ea1a50be728f42a2a125dcdaa74616f8b0b3266176b0e653baad5e705 413013650bf6303f974c7b95ba19e823173c3c138f362a44307d1a0b88efc01f lib/codeql/rust/elements/internal/generated/ArgList.qll 1b75b2d7dcf524eb468a0268af6293e9d17832d6bedf3feec49a535824339b57 2bcaf464454bdfdda45fbd24d063f0f1df0eb69f684197b37105adc8f72cd1ea lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll 67a7b0fae04b11cf771727ff39a123fb2d5ce6e2d650d32478fcb33a26ed5688 15833405fa85f6abe0e5146dac283cb5a142a07f08300ccc15a1dae30ed88942 @@ -557,7 +558,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60 lib/codeql/rust/elements/internal/generated/ParenPat.qll 4f168ef5d5bb87a903251cc31b2e44a759b099ec69c90af31783fbb15778c940 0e34f94a45a13396fd57d94c245dc64d1adde2ab0e22b56946f7e94c04e297fc lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 40ab5c592e7699c621787793743e33988de71ff42ca27599f5ab3ddb70e3f7d8 12c0a6eed2202ee3e892f61da3b3ce77ac3190854cdf3097e8d2be98aa3cb91d -lib/codeql/rust/elements/internal/generated/ParentChild.qll 1d06fb28e4ded1394a62f16aafd7a3f3e405a26e6021903825d6a038467c751f 23c106c4b7058256444ccfb9218add6d623d18d28fd460351677ab2519d72f4d +lib/codeql/rust/elements/internal/generated/ParentChild.qll d23340fcdef1a131abe03badd641b2de528b35e4a6f428977334047a276c5801 5888015d46a57dcb7c7707ae5fef9db1cbf33692e6c3a3a3b8d9f1ddbef62b3c lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4 lib/codeql/rust/elements/internal/generated/Path.qll bf6a86e7fcb7164624cc070dcce86d2bda50a2516b95115b87d0ebb5596e50a1 fd7a9ad4034cdebe8dfe495619c46f464630d38195313072e0bd904061b0fb00 lib/codeql/rust/elements/internal/generated/PathAstNode.qll e6d4d5bffd3c623baaaee46bc183eb31ce88795535f164f6a9b9b4d98bbd6101 168db515404933479ba6b150c72e012d28592cbc32366aefcb1bf9599dbcd183 @@ -571,7 +572,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 51d1e9e683fc79dddbff lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9 -lib/codeql/rust/elements/internal/generated/Raw.qll 51285a69ae63380b7b84d5ba70612117943d4f4be62752d6580e59ce5bec7ce8 c3966a03912682791a07351a23792968758efa7a365df3d2966017537590d402 +lib/codeql/rust/elements/internal/generated/Raw.qll 16ce13a21bdde691e2856deef2734ba23c85a9a0f9a882206ddc711ce7106755 6a69912b39e8da4e9b6ff1b61b147c313675ccdb96de73d51c4dca4b6a60f344 lib/codeql/rust/elements/internal/generated/RecordExpr.qll 2131b2cb336caa76170082e69776011bf02576bbfdd34ba68ca84af24209250a 39a2e3ec32352b594c43cc1295e0e8b3f9808173322d3d73cb7d48ef969d5565 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0 @@ -584,7 +585,7 @@ lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 3d8c0bd296d33b91a81633f697a43269a6538df06d277262d3990d3f6880ef57 13680f39e89bcd8299c218aba396f3deec804597e6f7cb7d4a7e7c748b6faa77 lib/codeql/rust/elements/internal/generated/Rename.qll d23f999dab4863f9412e142756f956d79867a3579bd077c56993bdde0a5ac2f1 9256c487d3614bf3d22faa294314f490cf312ab526b8de0882e3a4a371434931 -lib/codeql/rust/elements/internal/generated/Resolvable.qll db6064eb6147f0c10c37b3585a4801ed6705b8cbcbaf1793af92a1b6da69aba7 302eb6b82f90eea04c8f7f65439f198cf1d4ad084253634b639b14a88376ed75 +lib/codeql/rust/elements/internal/generated/Resolvable.qll 19f90b2f4d17ec4343b303b6dcef18c60dfccce9bceb7bdde1507014f929326a 3eccee14e107f2aeb490b80014fe2a38d2a5ba8b6b40dbd30ab67e1122b8f390 lib/codeql/rust/elements/internal/generated/RestPat.qll 234bbaa8aa37962c9138baf5b1f4406c3d78f4131b4b8dbb30fc1343d15873d5 653ee6bea4d3cf9454b2834bc4233a8f275295f19635c37a0bca69a587e1eb20 lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 173fd722308161f9405f929a13718134f8eaefe9fce1686048860b7c8f4c29f7 30bbaada842369dac5618ae573999f59979597c6a3315c6cce04e5bed0b38c87 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268 @@ -597,8 +598,8 @@ lib/codeql/rust/elements/internal/generated/Static.qll ea22838e0b7d9796dfaf5deda lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e -lib/codeql/rust/elements/internal/generated/Synth.qll dae33e1611a5082ab52dbd5fca8bd55d1a95a8a1d2a453e6f0f9e14ebf0925b4 a6532f979175c7e17a14f411577fe716a779382dae83a684c09982364799561e -lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 9acb065f62f596cfff088f50996be5cffb4c6c1469a3f2a5835cf5a5f6c50db4 9acb065f62f596cfff088f50996be5cffb4c6c1469a3f2a5835cf5a5f6c50db4 +lib/codeql/rust/elements/internal/generated/Synth.qll a1341446083fa92d7eab01cb80b79ef71fe81974cb848152a87e5a8f54b63dd6 c9254ea4bd48ce66c8a2717bf811cfc99fbbb83b9de6e98c33957a651c76d3ea +lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 2239b4c8ab67d2c4816767d86a2e96609a17e81bd397cc7a46147b81e5e94f61 2239b4c8ab67d2c4816767d86a2e96609a17e81bd397cc7a46147b81e5e94f61 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e @@ -637,22 +638,22 @@ lib/codeql/rust/elements/internal/generated/canonical_paths/CanonicalPath.qll d2 lib/codeql/rust/elements/internal/generated/canonical_paths/CanonicalPathElement.qll 61446d0f3bcd327bad6b31c3c60c62571feaf862b31dda6474e01c8f37e8059a 33f2827acb058317b7c493fcb66a5b4bb434ac9ad739bbd449da971e72cb480f lib/codeql/rust/elements/internal/generated/canonical_paths/ConcreteTypeCanonicalPath.qll 4401616f47a95cccec68199bb49c18442a78dde023832f8fd5e16c73219baede 12f65fd81dc20ff5f4b74dac2232818fe75cb2e7f9abfdcae2177acc620b2c0f lib/codeql/rust/elements/internal/generated/canonical_paths/ConstGenericTypeArg.qll 69aae3c8c9d0ba87d543e6cec3d8783950b31888a6da15e5be37da81c7690238 780a9afc1e43ec885afc2ea22259c4f417244a7efcfb8dd3dc6209462e5faffc -lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRoot.qll fe71542b7f5943dc612bf8e52bc817473276460a9138babb7b33176c97d734a7 9cdc982cd8bf7802a82ec08c628ee262c527e25967b15632dc0e47f8e78daa28 +lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRef.qll be30f2bf11f46fea8fcf79baa3adacb41d9fbb168e13b106c649224f13cb11f0 2a25d7abad55733041812c43ed4be62f99f971169fd6bc3a6dd49b778f0edd7f lib/codeql/rust/elements/internal/generated/canonical_paths/DerivedTypeCanonicalPath.qll 8e57c57332da344c2b5d9fcdbd079da0f8e322d500b953c5ddeac12dd783fb6f 57224ed02e4e1ada6b01dfa58953bdd7f13cab06d55b90957e64d9d1accead0a -lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRoot.qll 4573e6afb64c334e7337c996d944763cea78e05174e00f1f5fc7598a7b66e364 84892d3a47b66ae2fd0f542141ed747b2cd700731891a7f86fd1a193c745b3db +lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRef.qll 090d102edab5641410ac9285197b610bb16ace28b79e7d27903fcb6e3681aea5 ce9e6129f8b8a937a8a2f62d1bd3fbe38b45514fd2be25b2ea1ffd3bbf447815 lib/codeql/rust/elements/internal/generated/canonical_paths/ModuleItemCanonicalPath.qll 0b31c6cff057a402051b44ea06a1224c107d8255848c028dbb48c5d8d5e92544 0e157a31e92d6cb9ac4a4cc828b204144def6511ff9fa9002f95b43064cb81e2 -lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll d0cc7157e09131e5f6a76b4ddda42ee2f8e5efb2002fe9e6d1da2c0b423a3c27 c2388f34f56333a0440c6c429833150fef7bdba6dbab1bf36224e6ff3dc6aea4 +lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll 78de0dc991e77dff838ee9bfb0be81d1034842d0e16dec31a49e9f80bbdf6c72 6b625cd29c65bddcd002d31f1ff2a4781378b6a097c274d5d25de9a10606a603 lib/codeql/rust/elements/internal/generated/canonical_paths/ParametrizedCanonicalPath.qll 5463401f6f8775df8914a913bfba08c69c75172b4cdafae01321c28b3e9bcd2e 9a0a44725b48df6325114821eb69b161c35f46110909aa98beb8208969d84541 lib/codeql/rust/elements/internal/generated/canonical_paths/PlaceholderTypeCanonicalPath.qll 27d476cb88f57e342d23218402236f6b15079ef773435102deb80bf57846c364 f143115ea2bd1c8805f3cef32cdc0a52ef9bf53a714ae68bf19c8d48e16d21bd -lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRoot.qll 9c9b3d4a0f00313cd8ef75e53e161fee78d08bfcac78d836fd8b9033a4617cc7 621349f2d1a66632ba57940c6ff8e963b297bc9881a4f3d901977fee4c6bcb83 -lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRoot.qll 460256c888b3c9efa19556614607b4b9475329d37fab1d16dc33e649c403e247 84526e02752be57e1b776ca08d199f97b3b9e23978da82c0ab5020658c6270e9 +lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRef.qll 03c32ed288fb60056ee27e56ee4ef90eb348d21dd0eab3086cc8668da01ea009 976f89c5eeb7ffe35951c062fe3f120a21402e3e6c45ea5cad69a3e2626fbf21 +lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRef.qll ef413b97aee48b99d93ad56bab0579fda27cffbd76343b158b0fbecfcd4b5c40 260a89c2af3bf666f229537c8d1306d50eb221ee232e6f39d116cd2026099bc1 lib/codeql/rust/elements/internal/generated/canonical_paths/TraitImplItemCanonicalPath.qll 48db8a423bbb8c68ab09872dc7a98bfddc7c699d86dc41256f18111bd9579a1c c651f217821dcdde23e06e2ac2ca1c1f87b4170d449c9b4c35c20ebef246e686 lib/codeql/rust/elements/internal/generated/canonical_paths/TypeCanonicalPath.qll 98251c42bc4163504b8ceec3502075f3551c2f66f61dc046fef4b13149337253 9bd821857a18356ab980d7fb5b1daa9bb42a738499e36e20a2944565b757c49d lib/codeql/rust/elements/internal/generated/canonical_paths/TypeGenericArg.qll 37c3e3bdee579697aa304d7df713249dc22df3068e189c21c182bba32b780622 b6e785b81f5a39c9643598d19b06f2beb2745dc8da63c8c91e50200824b9e8a7 lib/codeql/rust/elements/internal/generated/canonical_paths/TypeGenericTypeArg.qll da1d56d3b9a41ac19ead37043e6035c4f42e32a284c0d6d925aadea4bf9691bc 4032024c23cc2910dab4760a2c249ec95324486c32d8f7fac1478e746635e19f lib/codeql/rust/elements/internal/generated/canonical_paths/TypeImplItemCanonicalPath.qll a6d5d4b0d4ed8e5ee372ebb5cce9d8f046a319978c276f93daa6ae6fbf3b01e7 170ac3b7625f1ed867c19821105c5e651d69a382cc82706bd0ab3330e2c58fb3 lib/codeql/rust/elements/internal/generated/canonical_paths/TypeItemCanonicalPath.qll d2007a4ea331957899a5628c8f42794256952e1942f7331d078ac1c28a5f82e4 a385d0e88d8fcb02e6eea60c8970972ff1d4b96467468caf712d6b992f33fd79 -lib/codeql/rust/elements.qll af50a798648d41478433341e6e344714ad82867d0100c093b4334845b15797d3 af50a798648d41478433341e6e344714ad82867d0100c093b4334845b15797d3 +lib/codeql/rust/elements.qll 3c0e06df3106c3355c76b2fc4e7d5e0b35e3779c2891ea239c062c49fd871960 3c0e06df3106c3355c76b2fc4e7d5e0b35e3779c2891ea239c062c49fd871960 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684 @@ -718,12 +719,10 @@ 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 467cbeab00b7056613541933debcedf8f22579216e250ba64918efc6567ebd03 05f81445603a6b143834bc409200cd79e14f45bdf5d4061c03ad078cfa93274d +test/extractor-tests/generated/Const/Const.ql 9d9abdd6ac043ba3d1ca37ffac75a8fa7a3f4690caaf2c425b369a0d4bfd61f6 c67faeac497fe58e6490dc68ec332ba1c4f0153f0795cef2464b679c7db7f9b1 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_getTypeRepr.ql 87c5deaa31014c40a035deaf149d76b3aca15c4560c93dd6f4b1ee5f76714baa f3e6b31e4877849792778d4535bd0389f3afd482a6a02f9ceb7e792e46fca83e test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661 @@ -741,11 +740,9 @@ test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae9872d92fa9b15343c93da545c2b0e15b4f27f2296c200fd4611b68858d5 52a209022e3b83260b4ef5513ffbcc1ca1f7c21bad2c721a0d3698793d2161d2 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql 513d64b564f359e1022ae6f3d6d4a8ad637f595f01f29a6c2a167d1c2e8f1f99 0c7a7af6ee1005126b9ab77b2a7732821f85f1d2d426312c98206cbbedc19bb2 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql b20720ff0b147d55cea6f2de44d5bf297e79991eaf103938ccd7ab9d129e9656 eb8c9db2581cea00c29d7772de0b0a125be02c37092217a419f1a2b6a9711a6c -test/extractor-tests/generated/Enum/Enum.ql a9047a6851e0bb2464b905fd9fb228bd23883bb978e749bc4c4429268a9df131 578c309bd4f89de813ee074ed162a8baab7586da09f6c7334b45fe8dfda072f4 +test/extractor-tests/generated/Enum/Enum.ql 769fb60d06933083a35aa58cb712c580d3dade8b503b7d3bea635e7004f044bc 5ef6388b8e1592f35d21cf1cfbec233ae0fde3c6d6db45733cc09eea4b6c7a5d 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 @@ -753,18 +750,14 @@ 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 aa1b2b0d48976824c7489a0c028e3bdbb7052697084631ca7807d4a975664555 dab39df74f212041f81f1706c6800f1adcbf37dca6d5da04672051e14ec76955 +test/extractor-tests/generated/ExternBlock/ExternBlock.ql 34d345942519d616704acde4481bf8d19d1d5524abd1ca341c6117b7f6e639f8 21c6093c9a50543f14372cda1bd772eda500cbb1a75c1a0cf0f4449db101c0b6 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 38c4959c09b3c8f4e541ad382674ebde5e861a658ab7fc775eb48d74b0eb4270 d86dd75ccafc1dc98f99821585f1721545f441b18774bb339038749b3d03c96b +test/extractor-tests/generated/ExternCrate/ExternCrate.ql c73c0c131023864ce3cd6d42476de61c906422728004e2cabeccbc6d11836118 4b94939837f7e3aaac6cb1945a3dd35f6efdcc2583480733170411d6133d0260 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 @@ -801,13 +794,11 @@ test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 7a7ee3a3322b4af8 test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql 7bd4ec3dde2ef0463585794101e6cc426c368b0e4ab95fbb1f24f8f0a76cf471 e7b01e8b21df5b22c51643e2c909c6fc4ca96fda41b3290c907ba228abe8669b test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 2793ba1ff52182dab992d82d3767a000928f6b2fbfdb621349cafc183f0d2480 c3777d03214f7feb9020de3ce45af6556129e39e9b30d083de605b70ab9a0a12 test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql 26d592398a17795427b5b6b51ff4a013ee15c31443e732a000baca5f2e65acca 7940a864b84b89e84d7fb186599cb8b6bcbead7141c592b8ab0c59fcd380d5fb -test/extractor-tests/generated/Function/Function.ql c78dcb8aa49acbd2110a7f19b02ce7ee09428e0c363318dd84ade543003e950c 5ada3778eb0db63c6674d6ee19401642fe65c883cbda0fa368c809b478c4a311 +test/extractor-tests/generated/Function/Function.ql fdbcd3e9db44205c511a7f953d15b4cb859379fea1af1dc1687124bd8f11ba53 cd2ed427589a2c0ff4c07112f8b5a12d348927e43e4e1c459746f9b0e345314d 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 @@ -827,12 +818,10 @@ 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 7f647b9c482f429930d9949b81dd93720c855c6b1588dca2937af5f1745284fb 67021bd70c168c4e4d3435a91caa431b95ed26ae2da19febcb79dd4c4097f15a +test/extractor-tests/generated/Impl/Impl.ql 0a229c7538deafa304dd14f2ab2610167e8958551ea7218e6112151ca81c50a2 330960df7fae2ed08b1527c6a4424a22e413b340c17a25db4471188a14ed8662 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 @@ -879,21 +868,17 @@ test/extractor-tests/generated/LoopExpr/LoopExpr.ql 37b320acefa3734331f87414de27 test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0 test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8 -test/extractor-tests/generated/MacroCall/MacroCall.ql 01c61d5298dd62b9b15536c7e0d40d85cc651a89b5a8957739f1ebb9a1daeccc 6ad942cf70cbc26f64ed9679b5e090f171f23c46a80076ee529f55edfefdbb94 +test/extractor-tests/generated/MacroCall/MacroCall.ql 0616bbb858e7967ffcfe1cc185339237c2b766f8c1448f1691e7ab754f0bf045 dc2d92da239fec038106a1f72b6b5cd38575e265009a1e52d13dd19ac945fd8b 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 f2993a903352ce5e8f830c746a8dc53ef84a286319af4457f752f8a65dce2f21 4d954809d4991328e2cc0d4f126c8d5d7e443b294b89a5cffcfecbe3e00b8504 +test/extractor-tests/generated/MacroDef/MacroDef.ql 1b7b02abba35412523fd1896f093d7e09f9cdaa460850d26d18c6009b7b3b27d 68f7833347979f7ac773d144f120aaf7e10933f603fdd3fe2e1cffeaa19a87df 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 @@ -902,11 +887,9 @@ 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 c201fdcf850d9b048d916d02628d6bb8f79c530d3a00d847e44ae6168968d955 5d5f5331bfe9c8972de1d33357d4aa2501fc48353eec257cc71420d517fef0af +test/extractor-tests/generated/MacroRules/MacroRules.ql bab0c425f34c95341dc5e0cc724528ba3339528fd291b6ab1a9b2b2e1b807904 91c3bec6bbbeeba58dbe8cff226fd8347866fcc929e0e592b88d1c9051240327 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 @@ -933,20 +916,16 @@ test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f6 test/extractor-tests/generated/Meta/Meta_getExpr.ql ec9ec61f5be7d65c32775fb5c068daea04f9db7d875293ed99cc1b2481db041f 77a0c52f1cb6ddc8fdb294d637f9eda1b7301ffa3067f0fca6272d894f57d3ee test/extractor-tests/generated/Meta/Meta_getPath.ql aa9d4145a4e613c51b6e4637d57e3b7d0f66e0bb88f4ce959d598870814c06bb 2087e00686d502c0e2e89c88eae0fb354463576a9ae4101320981d3fd79b9078 test/extractor-tests/generated/Meta/Meta_getTokenTree.ql 1051c27ffd0d9a20436d684fde529b9ff55abe30d50e1d575b0318951e75bd34 983975672d928fb907676628384c949731da9807bf0c781bb7ec749d25733d2d -test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b58d51eaecc3013af64a6d7209934e8772c26e6c2a838f1a6ecda58b9cf7b595 f6a61ed3093f18c632d7a0181b1f7610bf2f0ee90204d82d55fd690fcfd65734 +test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 4e1ce970974bc31ea82568700eb1c2bd79f0a98d7589b92e3ff1c236db52aea0 62d413e029aecfa1ed976722f0ead0f1887b39c408b5c44a6b53e81d4715dcdd test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql 180e0b1715f5cd2be0de01bff3d3a45594b495b8250748d40ff7108d6c85923d bdadcdbecca5891287a47b6dd6b2fda62e07457718aef39212503ab63bc17783 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a04a159efce83b863dffc47fbb714b95daea2b91fa6fbb623d28eed9ec 7bca1cd0e8fbceec0e640afb6800e1780eff5b5b402e71b9b169c0ba26966f96 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/MethodCallExpr/MethodCallExpr_getResolvedCanonicalPath.ql 7c1692b433e4580a3eadfa75b0881d931bfa398291aebfbf6acbb4fc49b7f1c2 554275f8d13e95c35f5c529f3c43e7d10f7fdeb524c47dba6a42229922736734 -test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql c22504665900715e8a32dd47627111e8cef4ed2646f74a8886dead15fbc85bb5 d92462cf3cb40dcd383bcaffc67d9a43e840494df9d7491339cbd09a0a73427b -test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql 9e7bbb7ed60db49b45c3bdf8e01ec58de751889fc394f59ac33f9d6e98200aa1 c055d877e2ff0edc78cce6dd79c78b2881e7940889729cbb5c12e7029ddeb5a3 -test/extractor-tests/generated/Module/Module.ql 4fded57dcf8d704f571c200e8c8b65f935a838cf1f44152a9fbe3f05afd868ca aa09e9a1948847265c0fec9011986034d0963e97fbcc51abbefa05a4e9a877d9 +test/extractor-tests/generated/Module/Module.ql 646ceef7347b6d8f7ae7b9360aabcfec6ccfc3cf612351ce246a35414b7ac743 6e733c1d3d9b9d84e2b12c84722c884b03e6c7941563f5e22cdb1a4f56e0b36f 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 @@ -976,17 +955,13 @@ test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql 96f3db0ec4e71fd870619 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql a96bb8b51d8c0c466afc1c076834fa16edf7e67fffe2f641799850dee43099a2 0e6c375e621b7a7756d39e8edd78b671e53d1aac757ac54a26747fe5259c5394 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql 64fe4ea708bc489ba64ed845f63cfbcd57c1179c57d95be309db37eac2f5eb71 0f4cbbfdf39d89830b5249cabf26d834fc2310b8a9579c19383c90cb4333afb7 test/extractor-tests/generated/Path/Path.ql 2bdcd99b3b5ffc83ac47d8cc27a4561d616bcf06844f0c452c699cd10ee640ca 5a7d7ffb8b0c04d6a8cbb2a953761df8561b796c4372bef1bd55c359b2f19911 -test/extractor-tests/generated/Path/PathExpr.ql 3697b6d8d332325fb980bf86706d58aa1805074bc46104626437e89afdaf3202 b5c5b09493198b66140ffe9c48d0790a40573109e9fe615cded6b6887551fa49 +test/extractor-tests/generated/Path/PathExpr.ql 85f1f80a16b18cf888ef60fdc956deb5e02365b8da7f4126993dccc942c07181 654d5bf44100d746a90b8a560ac609811263e36483ce510d40ea253df3c5631b test/extractor-tests/generated/Path/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d test/extractor-tests/generated/Path/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51 test/extractor-tests/generated/Path/PathExpr_getResolvedCanonicalPath.ql c6ba7bea708fbd8137767b813c8008fbb367eda1a9a9ab2b35f6cd4ff9915522 029bcde2f10d3e17d9e092dd49be9d6956e51dbfaed78911c70a65dea0b78300 -test/extractor-tests/generated/Path/PathExpr_getResolvedCrateOrigin.ql a68a1f0d865d10c955f7ab1fd7614b517e660553b65fabb9daa8f302adbc2602 c47480d6440ae63be27d8158a35536a8d9051817dec1521cdcab297ddb52e1ae -test/extractor-tests/generated/Path/PathExpr_getResolvedPath.ql dfa55fe480da0df37670660fc1c54b6c38d47365353bc9d4f662183b33d4e80f 1b18329a7b60805fc073df3149c48f39aa66924d7eefedecbca36a2b170a7fbe -test/extractor-tests/generated/Path/PathPat.ql 37a5644f9e62162d1401caee64f919be0f649ecef6ab5124efe24a63d83c16d7 3753481030deb70da69aaef721693a4b08fd9d9e7bfa08bfe476e5656a2e836a +test/extractor-tests/generated/Path/PathPat.ql 0f0fe27311d61ee005b14b7e685c84b8ce6eaa2d57d848211b63e78d20457bc7 85525db4dc85bdb83bd373fa30473fe9d6a5697e84f5086be8933dd6ad65b2b8 test/extractor-tests/generated/Path/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb test/extractor-tests/generated/Path/PathPat_getResolvedCanonicalPath.ql 5fb21b11e054054947f1c7b52b985e90a5ddb0e93915b48af68ae15888960b36 e3cb25aab7053cc2b9fe2966cfa6c43677cdf177f1515efb0634228be8fc076b -test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql f690fd9a8773e7c73b70f2d64ee919fef8eee243c5a315c4a6d2713d43ea0e43 f37817427c36cec14a2e07f99d3a32f37f3f27a8eafdf170749ec2780054729b -test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql 55df4541a7b0e82198acfcedd7dc99eb564908270e4fb2b032bf05e40fba6fef a5932d884903da901263f88644c8585a45045190d7204f630506c5aece798288 test/extractor-tests/generated/Path/PathSegment.ql be9d62d38b0c7f8b5a8ea86dcb18c62f24930f5931f52e6073414f291d8c0451 31288b7728d45715acf6ab751b833b29473a74d54d9b26f83a73d8c91e3c82da test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql 8f6e67b3e316309f20e21d7e7944accf66b0256b76fa50ee9a714044c6ec8cea 15f10a701fc4d3f9fd6734da90790cdbc8a1ddd57bf52695740acedcb2e6e485 test/extractor-tests/generated/Path/PathSegment_getNameRef.ql 799d284e2f9267d6bbe67aa7035e525ef347dc74cb3e2180e7b2171b5cb49674 592130bc2358989536abf62e8a261272c851483ede4f19783f7d61ffc1803e4b @@ -1014,12 +989,10 @@ test/extractor-tests/generated/RangePat/RangePat.ql 97314b9a5543a7471d722ae188a6 test/extractor-tests/generated/RangePat/RangePat_getEnd.ql 723eb5030ec52d3aa3650a3e2de6cc0195a0030630239b972235963320e0d808 2df3b1a6197c3abd43dc743fd09cbf55165e3191f2b49336777594541e5da96a test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql 564216b2342f56dc8c1aed6306f57b6dafb33de9e3ba337a840a8c077ce95933 2a76ec7a59bada29733a1515bc1ea8bedd37429d1694ca63c7a8fbf94098a4c7 test/extractor-tests/generated/RangePat/RangePat_getStart.ql ad2066efa32fced2dd107031f2a9b9635c3c892e874870a4320522bae9309aa4 b4a8c57a838074e186b823938d1a9372153c193da6c839b5f242ca25c679e83f -test/extractor-tests/generated/RecordExpr/RecordExpr.ql f86fb45c56cce41e868e86bfedcba8899b4de31094b59e9e7a8ba6598cb40051 340bc619c7b81427fe7f66118d51727331a1b4c63e41ba5b101489999945d561 +test/extractor-tests/generated/RecordExpr/RecordExpr.ql fbdd0032a2b9566b568c9a4e4fe143ce50b4465f9bc3d73fbc2f30c3ede09afc fbf446dcf04705293fa1ba456760f48e6d51989e6ce112694e6d2dd1ec7c2bde test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql 2eb8f7591f08199d124732d7f2d7dd3e81792a52f8e6c90003aa0609923f8cb0 27e245224d6c9aa20023b418ce8dffff1293b50a0e10938932631fca7c559e78 test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql 6d3d872eb64ff8cd7317190f9b2627d3fa6a74976e362cfb49e21c6623d63f82 d98b07f932ecb25a427e655017de47f951d3eabc4eedbc6f873571ce8921e9ff test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCanonicalPath.ql 0df6c5d228c02ad9d676829d3a86e7c099a4a1e506e1bf016bf6d4da40dc408b 50fea626f0969ea9107c59a38339926a92b5d3170e46293d1f737a4eaeb01d68 -test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql 87d463c7950407c86783b9ccbcf6daa4f62f5fcb75bc20f1879bde9240281d4d 5659b4fb8b25cd998211aa3edb11188b3c487cabaf7a09989ce6fe0e4f67ba25 -test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql 0de885c7efdd257ee44d2c8a2ad91e419d604517471966059ddae321e80597b6 7977fb7a8c954733dbb5cf8378d6103688d16bc4c9b891c68098d0ec224429b4 test/extractor-tests/generated/RecordExprField/RecordExprField.ql 62ee00e478fcf07421b5989943a487ecc0c99cf50ec87f05aabe89dfb03f2a32 ad7c6ce362032e18fc9950b885c4b7b5c907e6abd2af2d13ecef84eb980027fb test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql 789d20f8c0bb0e9567d3d9a0c0266a04841cda0dbdbe10af8c450d5a82bb289e 9036f5b0e7ddf301012f52f3919804382421061366d2a4f3a016e9783befec6d test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql 7dcb5cf0d04bcd62b655fa0626535526cdaa0f891845f4b22cb50fcf1ae3e511 a177db76e4e9583438fad9bfb1300fed9e812c1046c44dccd307bf3a46603a69 @@ -1035,12 +1008,10 @@ test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql f61cfcd0c6 test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql cc45e9bb9418d15cef07a1827358c3f18a8737324c8e6852591a2da70df89360 45557497fc165a212fffda71dedabc8159a4f72323430df732698a18922b366c test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql 586bccfa550243177d9fdfd6900a473f51a76ed360b537f19cb300330d5dad5b a063373dfdbf06b68c69694ea4ae72a26b906c910f9095894c09e72f8fb52819 test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql 2eb92ef8528204f3f105c19a36cdc06b3b6d20242463ff2ed1fb81c544812a71 d69091899e7157099f117e14fe60cd3705cfda45f28f6a6a2b7234a4a9c1e664 -test/extractor-tests/generated/RecordPat/RecordPat.ql 1f7a129a923663cbc23cca2361cce4680af9463b5cf3f3b172b4fd3fc52e3cf1 39ae84851ecd512cd2777b6ed6cf12429ab5a5ba6becf25b70c9e9073c43b344 +test/extractor-tests/generated/RecordPat/RecordPat.ql c6caf4b6f215de2c3df3b51931be5a05f3432d65995de69807e1578f0f4ce2e5 521e5265e19f6df3132310c8987589ae686be1068b7f4434ffa4a0da82bdb1ea test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql 187b8d44de158fc809257e28b2e8fdd246c8eb3c60115d54cd53396a320e372d 74813fd13c6f34927420ed44620743f7c80c537984e0db72c1c5f4b754b40b83 test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql 32e45a6f59cdb8edbf7f9326164e225a7f545fabd2dd168b660699954a999fdf 325c9121dc130459426b473691876a0698b51d5cdf4530698a398510ce8e3051 test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCanonicalPath.ql c323c91c14aee44659492db28711c238c2e4b2bf5b8b6ab327fff63a5fa935dd 246b72cfa03cdf24b0189b476af748116254160f73b8511416f373826cebabaf -test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql 61a47db765e0c45797d3f92318fb6dbf07dfe1a2e63704294c58d49cb0894676 86a636746458053278a8ba0be062a9b1cfcad4866e065a8317fa8f033518ecae -test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql 0221208e93c4a26e555dd848238b4f5bcabf2ccf3fc38ceb2eef45c39d67b21a 37d80014a21a19e9132ad645a17234e33bb20f2352b450277b8fa919a54b95e9 test/extractor-tests/generated/RecordPatField/RecordPatField.ql 6c51343258e56673d21b7ae73e7de011319ffa2eb65390e697f875bb428d25d1 82c3232db0cb353140618749b1cba5549b0ff43cbbaafb203077e18dbedb2c10 test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql fb0592f7a1be4fd9c6f36c79dee5a0f6711b0a7820b079f8e95413722ae1aeb7 9dfb0de00ec9c4a23efd38515c63a3567204f2a3ac2634858296f58aa564d170 test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql 3380a41d6cecd80681fc955719fa11377c32a5e0be276871f2d0d75ae62d8f0a 44efe89657d3a59fb94962d0fbf52d06571e203863a3d9e9dd47a5135a8ba4d9 @@ -1078,12 +1049,10 @@ test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql a6604f test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6 test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551 test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95 -test/extractor-tests/generated/Static/Static.ql dc4b6a3a1abd5577564bf4bfe8d2bc71f7e8cfc1d98f99cd192dde66b4e60e53 ef55486d1a47d51ca2d86972ad6f0a6db8954e3073946723e4dff76c6035440e +test/extractor-tests/generated/Static/Static.ql f4b8c49c4b3ce9de632307521c04f3bb1df30ada73e6f7aae1dd268912fff507 508769a32d9a2af35217e43ce3c4f0f05cb979a09e2e6f704392a4a4bbc2579c 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_getTypeRepr.ql 45efcf393a3c6d4eca92416d8d6c88e0d0e85a2bc017da097ae2bbbe8a271a32 374b551e2d58813203df6f475a1701c89508803693e2a4bec7afc86c2d58d60b test/extractor-tests/generated/Static/Static_getVisibility.ql 0672b27f16955f7b0223a27c037884338dcf30759b7b8bb3da44e5d533228f90 0e4916f5683963041ef23c724ca8e16acfa370b583d90b76508c87131b9e1c73 @@ -1091,11 +1060,9 @@ 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 a844cf71f1fc524d790f21640893aad3e39b750cd9942744272a517a428ad370 a1df901751d1930737d59c272d8d0c11dc956f506a38982d179bee9008819ca5 +test/extractor-tests/generated/Struct/Struct.ql c9ea9f8e309732ba451b88acb7ba9dbc406085a9363b0cae8c59a2f9d80ef804 3ad984a5cdb0a5295daaf8521eaacfe0712a43911a0301ec0230b1010673a0d4 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 @@ -1105,22 +1072,18 @@ 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 3572861043991a88a9b7b04aba44823e3854bd06ffddca2b335e9f4e62c39848 a2ed34bd1ff46216289dd0bbdfcd431ef414d8a3e9113a016dabd6fbc260aa12 +test/extractor-tests/generated/Trait/Trait.ql 7cb27d07d2293509bbb040902e1d7d917f3a9e4d3bc148efbd21a257cd63627d 44a798b39328f925f6ed2a855c08fd986efe3a24373220d7170685c6e95d993f 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 2276b69235768d5e7454694efd3394f7b00103380597264db92bf0ee06a7433f 41d8a95224cbb359838cabbb0b4dd0f77809024e44c252b5c22505df9648ead3 +test/extractor-tests/generated/TraitAlias/TraitAlias.ql 67fe4f72859c5392ad228f3385c347551ea1c246e75cdc5fc232888dbeefb99c 41ee85bcbb6d59ab3ab88f531411ddfcee08cd35eb25f16c3286bd4bcbbb09d8 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 @@ -1140,19 +1103,15 @@ test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 7dc88440222ff036 test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql ad552a9c0b9964d1770f14cabbb436db60ebedc3c569006542a8eae9ddb30f6d 3a8c49d629376a9b8326138836b05ee2366b1021ffd19f5be74ab023e70aa50d test/extractor-tests/generated/TuplePat/TuplePat.ql 24ee56bc848537da65eb8ecef71e84cc351a2aedcc31d6fb53a5b7865f15f7c2 81db1076e2e4921ceb50933b96cd7b574caab1818de257c1e9038f3f97447d59 test/extractor-tests/generated/TuplePat/TuplePat_getField.ql f000bed41af031bc56d0705ce312abe7ab3dc6745b2936798c9938781e51475e f464a84dbc36aa371d60d6db68d6251f6b275dc4ecebdc56f195637be390b067 -test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 4b3eebdef05fd2ccb3c4be56eee1e89a07775f45dbc82f69dc4096682674a187 84a6994f0c0dd313acf2b4c4c7066ee94af2db8d066c68d15b9c3955c98a2db4 +test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 10be4d7ddc82b437209b945b04a602e57fdeaf1b6b3ccff7d6f3bce08acbe1eb c86e1d3c38408eaba8bf234c2f11467557a4ada315c20c3ec175f42eaeea582f test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23cc2a32aa5abc1e0fda1300dab1693230632b9eaa75bb3b1e82ee9ea1a 24b87a39ec639a26ff8c1d04dc3429b72266b2a3b1650a06a7cd4387b6f0e615 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCanonicalPath.ql 91b4b1b562c33a07ff3007346c4cb9833149263dd196995b3b0e00894abb87f7 fa8c8d6b34277d53bf5ff211c54e1a634d0c215288185802fc3fbdd19c945f22 -test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOrigin.ql e409667233331a038e482de4b2669d9fac9d7eb0e3bd5580ea19828f0c4ed7ad 588e4628471f1004575900d7365490efcf9168b555ff26becfc3f27b9e657de3 -test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql 150898b6e55cc74b9ddb947f136b5a7f538ee5598928c5724d80e3ddf93ae499 66e0bd7b32df8f5bbe229cc02be6a07cb9ec0fe8b444dad3f5b32282a90551ee test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f99917a95a85a932f423cba5a619a51cada8e704b93c54b0a8cb5d7a1129fa1 759bd02347c898139ac7dabe207988eea125be24d3e4c2282b791ec810c16ea7 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql 615acfcbc475b5c2ffa8e46d023fc2e19d29ee879b4949644a7f0b25c33125e6 81b037af5dcb8a0489a7a81a0ad668ca781b71d4406c123c4f1c4f558722f13e -test/extractor-tests/generated/TypeAlias/TypeAlias.ql ae1e918dca09e31f64cd7c764b51fc61e3849d728cc8b63f15ad55c5c97fe755 c3b4fc5973b436b3c87d303cdaf93cfd7f91675d0e08ce405c51713b4bbd7607 +test/extractor-tests/generated/TypeAlias/TypeAlias.ql 4000cf08561ccc45230b2995e63e7278804536b6bec1a28567ff0e33fa9b5155 398ab83e01b8774d881f73c85c27fa0ee9723502271ec2616d6dd93b15b27e52 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_getTypeBoundList.ql 309efaa32a840fb1fca7d34b7cdbbf51ab469707fa195b69a9f1a7d141db3a02 e12bf44d8858e930bdde80ecd7909b5405a51a1b00a6d2c8ee880e68dd622075 @@ -1174,21 +1133,17 @@ 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 3b1e67ab43881389cabcde0e8db4153c4b21b405130d0c21e6c753f0bcc5f5a5 3c049d0935668539b23c54a90f2c8f874cb8a070018b2c63208f979c5f41dd9c +test/extractor-tests/generated/Union/Union.ql 2c78d68026772c8bcfe9fccce8e51bfb895a8fa19d6502b618f31b3f0e7d26b5 940acf8960ecab4705933ac8617439dc8aa20e09af5737e52d40df2e3054d9bb 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 b83d07a0650e9cd4a0bdf44e3912e80e504ae4d7824d614701e5b7e92b5b1bb9 4522d642a171d1783895a821b1292214e4a68bdc1edb94e61b930646fe0e7133 +test/extractor-tests/generated/Use/Use.ql 560bdfb307ea85ed4f3785081a67d21cac4e2156da15a704f266f54675e5e5b3 ac71b0b68cc1c3b1f36bc975cf9b24dfff8be6d95e0e2d7e1d7a7b314b36f7d0 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 @@ -1197,12 +1152,10 @@ test/extractor-tests/generated/UseTree/UseTree_getRename.ql ec3917501f3c89ac4974 test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql c265a88347e813840969ae934dfd2904bc06f502de77709bc0b1c7255e46382a 52a239c8ea5fd8fbfbd606559d70ecadc769887437a9bcab6fb3e774208ad868 test/extractor-tests/generated/UseTreeList/UseTreeList.ql cd943c15c86e66244caafeb95b960a5c3d351d5edbd506258744fb60a61af3b2 cfa584cd9d8aa08267fd1106745a66226b2c99fadd1da65059cc7ecf2f2e68cf test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql dd72966b1cb7b04f0267503013809063fcfb145e2b2d7d5250d9f24d2e405f9a 75b953aa11c51ca0fe95e67d50d6238962d8df4a4b9054999a2c6338e5a5613d -test/extractor-tests/generated/Variant/Variant.ql 374b0fd9e992acbdf2b58015681dcb9167bed4e2a64e4b22b8088f47ca2f8730 5af7e9b34b0e45bdee91a9cd4724805b2e9051df43c9e66fafc0f6dfc2b86d80 +test/extractor-tests/generated/Variant/Variant.ql dbce5711476e1169f86d01f45fa41ed0e493c6adab1e26f163a31f19b33692cc 4d8dc13b17617367ebc9837b8d2ba461363ef807ddb3a5fa263975552a0902a8 test/extractor-tests/generated/Variant/Variant_getAttr.ql dd38e48e1eb05ce280b880652a90010eb63f7de3be7232411ba6265691249420 f8980680104de1e5fd40f264d8d62346aacaf6403a5e051f6fd680e234c82c1f test/extractor-tests/generated/Variant/Variant_getCanonicalPath.ql b8177f13ba56964ff621016395b7095daf3121fd21f6a5db5104f21c8d388774 64aae1b34f459bff5edf483ff4f7407bea218c12df7ed4e6d54974f6fc7a77bb -test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql 99e79930f8ff87a25f256926e5c3ce1ee0847daf6fadc5445fb33c85328b4c61 2dd64a53813790654c83be25b5e175c9c5b388e758723c2138fff095353fdd7b test/extractor-tests/generated/Variant/Variant_getExpr.ql ce00af303d28f60c5fd1dc7df628c7974aced21884e223a2f656cb4f0d1a74d5 9de51a65510cf9a15801d4207b616915bd959c95ec7330fdb502c5dff5b650cc -test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql fe6a4bfd1440e7629d47283910de84c5e8c2f5645512780e710f53540b5bc886 b1e31b765cb1a5fe063abb8c1b2115e881ae28aa3ccd39e088ff8f2af20d6cf4 test/extractor-tests/generated/Variant/Variant_getFieldList.ql 083c8cf61989663de33d99b72dec231c308ccc8bb6739921465c473a07e8ea03 d03bff6945853c940acdc053b813d53b008ddab9a8bd4307826433828d4763ce test/extractor-tests/generated/Variant/Variant_getName.ql 0d7b47bec9f9031c67f7b684112a84a311ef9b2efeb260bd7cd6f424011ca0d8 73565e6f965dd7fd7bb9b3408c7d7b69120e1971b67ab307fed293eb663a59ae test/extractor-tests/generated/Variant/Variant_getVisibility.ql 2c8f365d28d96af55589f4d71ac3fee718b319b4cbc784560c0591d1f605a119 13160d9cf39fe169410eff6c338f5d063e1948109e8f18dd33ea0064f1dd9283 diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes index e96a1d29394..01f48fe54ed 100644 --- a/rust/ql/.gitattributes +++ b/rust/ql/.gitattributes @@ -179,15 +179,15 @@ /lib/codeql/rust/elements/canonical_paths/CanonicalPathElement.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/ConcreteTypeCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/ConstGenericTypeArg.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/CrateRoot.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/CrateRef.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/DerivedTypeCanonicalPath.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/LangCrateRoot.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/LangCrateRef.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/ModuleItemCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/Namespace.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/ParametrizedCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/PlaceholderTypeCanonicalPath.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/RepoCrateRoot.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/RustcCrateRoot.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/RepoCrateRef.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/RustcCrateRef.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/TraitImplItemCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/TypeCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/TypeGenericArg.qll linguist-generated @@ -198,14 +198,15 @@ /lib/codeql/rust/elements/canonical_paths/internal/BuiltinTypeCanonicalPathImpl.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/ConcreteTypeCanonicalPathConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/ConstGenericTypeArgConstructor.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/internal/CrateRefImpl.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/DerivedTypeCanonicalPathConstructor.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootConstructor.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRefConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/ModuleItemCanonicalPathConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/NamespaceConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/ParametrizedCanonicalPathConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/PlaceholderTypeCanonicalPathConstructor.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootConstructor.qll linguist-generated -/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootConstructor.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRefConstructor.qll linguist-generated +/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRefConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/TraitImplItemCanonicalPathConstructor.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/TypeCanonicalPathImpl.qll linguist-generated /lib/codeql/rust/elements/canonical_paths/internal/TypeGenericTypeArgConstructor.qll linguist-generated @@ -639,15 +640,15 @@ /lib/codeql/rust/elements/internal/generated/canonical_paths/CanonicalPathElement.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/ConcreteTypeCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/ConstGenericTypeArg.qll linguist-generated -/lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRoot.qll linguist-generated +/lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRef.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/DerivedTypeCanonicalPath.qll linguist-generated -/lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRoot.qll linguist-generated +/lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRef.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/ModuleItemCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/ParametrizedCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/PlaceholderTypeCanonicalPath.qll linguist-generated -/lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRoot.qll linguist-generated -/lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRoot.qll linguist-generated +/lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRef.qll linguist-generated +/lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRef.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/TraitImplItemCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/TypeCanonicalPath.qll linguist-generated /lib/codeql/rust/elements/internal/generated/canonical_paths/TypeGenericArg.qll linguist-generated @@ -724,8 +725,6 @@ /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_getTypeRepr.ql linguist-generated /test/extractor-tests/generated/Const/Const_getVisibility.ql linguist-generated @@ -746,8 +745,6 @@ /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 @@ -759,14 +756,10 @@ /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 @@ -808,8 +801,6 @@ /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 @@ -833,8 +824,6 @@ /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 @@ -884,9 +873,7 @@ /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 @@ -894,8 +881,6 @@ /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 @@ -907,8 +892,6 @@ /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 @@ -942,13 +925,9 @@ /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql linguist-generated /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql linguist-generated /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/Module/Module.ql linguist-generated /test/extractor-tests/generated/Module/Module_getAttr.ql linguist-generated /test/extractor-tests/generated/Module/Module_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 @@ -982,13 +961,9 @@ /test/extractor-tests/generated/Path/PathExpr_getAttr.ql linguist-generated /test/extractor-tests/generated/Path/PathExpr_getPath.ql linguist-generated /test/extractor-tests/generated/Path/PathExpr_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/Path/PathExpr_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/Path/PathExpr_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/Path/PathPat.ql linguist-generated /test/extractor-tests/generated/Path/PathPat_getPath.ql linguist-generated /test/extractor-tests/generated/Path/PathPat_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/Path/PathSegment.ql linguist-generated /test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql linguist-generated /test/extractor-tests/generated/Path/PathSegment_getNameRef.ql linguist-generated @@ -1020,8 +995,6 @@ /test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql linguist-generated /test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql linguist-generated /test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/RecordExprField/RecordExprField.ql linguist-generated /test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql linguist-generated /test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql linguist-generated @@ -1041,8 +1014,6 @@ /test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql linguist-generated /test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql linguist-generated /test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/RecordPatField/RecordPatField.ql linguist-generated /test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql linguist-generated /test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql linguist-generated @@ -1084,8 +1055,6 @@ /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_getTypeRepr.ql linguist-generated /test/extractor-tests/generated/Static/Static_getVisibility.ql linguist-generated @@ -1096,8 +1065,6 @@ /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 @@ -1111,8 +1078,6 @@ /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 @@ -1121,8 +1086,6 @@ /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 @@ -1146,15 +1109,11 @@ /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql linguist-generated /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql linguist-generated /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOrigin.ql linguist-generated -/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql linguist-generated /test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql linguist-generated /test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql linguist-generated /test/extractor-tests/generated/TypeAlias/TypeAlias.ql linguist-generated /test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql linguist-generated /test/extractor-tests/generated/TypeAlias/TypeAlias_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_getTypeBoundList.ql linguist-generated @@ -1179,8 +1138,6 @@ /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 @@ -1189,8 +1146,6 @@ /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 @@ -1202,9 +1157,7 @@ /test/extractor-tests/generated/Variant/Variant.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getAttr.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getCanonicalPath.ql linguist-generated -/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getExpr.ql linguist-generated -/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getFieldList.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getName.ql linguist-generated /test/extractor-tests/generated/Variant/Variant_getVisibility.ql linguist-generated diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll index a36afb4450f..f1dd8d7d5fe 100644 --- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll +++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll @@ -566,45 +566,6 @@ module LocalFlow { private import codeql.util.Option -private class CrateOrigin extends string { - CrateOrigin() { - this = [any(Item i).getCrateOrigin(), any(Resolvable r).getResolvedCrateOrigin()] - } -} - -private class CrateOriginOption = Option::Option; - -pragma[nomagic] -private predicate hasExtendedCanonicalPath(Item i, CrateOriginOption crate, string path) { - path = i.getExtendedCanonicalPath() and - ( - crate.asSome() = i.getCrateOrigin() - or - crate.isNone() and - not i.hasCrateOrigin() - ) -} - -pragma[nomagic] -private predicate variantHasExtendedCanonicalPath( - Enum e, Variant v, CrateOriginOption crate, string path, string name -) { - hasExtendedCanonicalPath(e, crate, path) and - v = e.getVariantList().getAVariant() and - name = v.getName().getText() -} - -pragma[nomagic] -private predicate resolveExtendedCanonicalPath(Resolvable r, CrateOriginOption crate, string path) { - path = r.getResolvedPath() and - ( - crate.asSome() = r.getResolvedCrateOrigin() - or - crate.isNone() and - not r.hasResolvedCrateOrigin() - ) -} - /** * A path to a value contained in an object. For example a field name of a struct. */ @@ -615,16 +576,16 @@ abstract class Content extends TContent { /** A canonical path pointing to an enum variant. */ class VariantCanonicalPath extends MkVariantCanonicalPath { - CrateOriginOption crate; - string path; + string namespace; + string enum; string name; - VariantCanonicalPath() { this = MkVariantCanonicalPath(crate, path, name) } + VariantCanonicalPath() { this = MkVariantCanonicalPath(namespace, enum, name) } /** Gets the underlying variant. */ - Variant getVariant() { variantHasExtendedCanonicalPath(_, result, crate, path, name) } + Variant getVariant() { result.hasStandardPath(namespace, enum, name) } - string getExtendedCanonicalPath() { result = path + "::" + name } + string getCanonicalPath() { result = namespace + "::" + enum + "::" + name } string toString() { result = name } @@ -673,17 +634,17 @@ private class VariantFieldContent extends VariantContent, TVariantFieldContent { /** A canonical path pointing to a struct. */ class StructCanonicalPath extends MkStructCanonicalPath { - CrateOriginOption crate; - string path; + string namespace; + string name; - StructCanonicalPath() { this = MkStructCanonicalPath(crate, path) } + StructCanonicalPath() { this = MkStructCanonicalPath(namespace, name) } /** Gets the underlying struct. */ - Struct getStruct() { hasExtendedCanonicalPath(result, crate, path) } + Struct getStruct() { result.hasStandardPath(namespace, name) } - string getExtendedCanonicalPath() { result = path } + string getCanonicalPath() { result = namespace + "::" + name } - string toString() { result = this.getStruct().getName().getText() } + string toString() { result = name } Location getLocation() { result = this.getStruct().getLocation() } } @@ -948,17 +909,17 @@ module RustDataFlow implements InputSig { /** Holds if path `p` resolves to struct `s`. */ private predicate pathResolveToStructCanonicalPath(PathAstNode p, StructCanonicalPath s) { - exists(CrateOriginOption crate, string path | - resolveExtendedCanonicalPath(p, crate, path) and - s = MkStructCanonicalPath(crate, path) + exists(string namespace, string name | + p.resolvesToStandardPath(namespace, name) and + s = MkStructCanonicalPath(namespace, name) ) } /** Holds if path `p` resolves to variant `v`. */ private predicate pathResolveToVariantCanonicalPath(PathAstNode p, VariantCanonicalPath v) { - exists(CrateOriginOption crate, string path, string name | - resolveExtendedCanonicalPath(p, crate, path + "::" + name) and - v = MkVariantCanonicalPath(crate, path, name) + exists(string namespace, string enum, string name | + p.resolvesToStandardPath(namespace, enum, name) and + v = MkVariantCanonicalPath(namespace, enum, name) ) } @@ -1036,8 +997,8 @@ module RustDataFlow implements InputSig { exists(TryExprCfgNode try | node1.asExpr() = try.getExpr() and node2.asExpr() = try and - c.(VariantPositionContent).getVariantCanonicalPath(0).getExtendedCanonicalPath() = - ["crate::option::Option::Some", "crate::result::Result::Ok"] + c.(VariantPositionContent).getVariantCanonicalPath(0).getCanonicalPath() = + ["std::option::Option::Some", "std::result::Result::Ok"] ) or VariableCapture::readStep(node1, c, node2) @@ -1431,28 +1392,27 @@ private module Cached { cached newtype TReturnKind = TNormalReturnKind() - private CrateOriginOption langCoreCrate() { result.asSome() = "lang:core" } - cached newtype TVariantCanonicalPath = - MkVariantCanonicalPath(CrateOriginOption crate, string path, string name) { - variantHasExtendedCanonicalPath(_, _, crate, path, name) + MkVariantCanonicalPath(string namespace, string enum, string name) { + any(Variant v).hasStandardPath(namespace, enum, name) or // TODO: Remove once library types are extracted - crate = langCoreCrate() and ( - path = "crate::option::Option" and + namespace = "std::option" and + enum = "Option" and name = "Some" or - path = "crate::result::Result" and + namespace = "std::result" and + enum = "Result" and name = ["Ok", "Err"] ) } cached newtype TStructCanonicalPath = - MkStructCanonicalPath(CrateOriginOption crate, string path) { - exists(Struct s | hasExtendedCanonicalPath(s, crate, path)) + MkStructCanonicalPath(string namespace, string name) { + any(Struct s).hasStandardPath(namespace, name) } cached @@ -1461,11 +1421,11 @@ private module Cached { pos in [0 .. v.getVariant().getFieldList().(TupleFieldList).getNumberOfFields() - 1] or // TODO: Remove once library types are extracted - v = MkVariantCanonicalPath(langCoreCrate(), "crate::option::Option", "Some") and - pos = 0 - or - // TODO: Remove once library types are extracted - v = MkVariantCanonicalPath(langCoreCrate(), "crate::result::Result", ["Ok", "Err"]) and + v = + [ + MkVariantCanonicalPath("std::option", "Option", "Some"), + MkVariantCanonicalPath("std::result", "Result", ["Ok", "Err"]) + ] and pos = 0 } or TVariantFieldContent(VariantCanonicalPath v, string field) { diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll index 492764b3cf5..613c28abf92 100644 --- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll +++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll @@ -24,19 +24,19 @@ module Input implements InputSig { exists(VariantCanonicalPath v | result = "Variant" | exists(int pos | c = TVariantPositionContent(v, pos) and - arg = v.getExtendedCanonicalPath() + "(" + pos + ")" + arg = v.getCanonicalPath() + "(" + pos + ")" ) or exists(string field | c = TVariantFieldContent(v, field) and - arg = v.getExtendedCanonicalPath() + "::" + field + arg = v.getCanonicalPath() + "::" + field ) ) or exists(StructCanonicalPath s, string field | result = "Struct" and c = TStructFieldContent(s, field) and - arg = s.getExtendedCanonicalPath() + "::" + field + arg = s.getCanonicalPath() + "::" + field ) or result = "ArrayElement" and diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll index 0503f983f1d..483c42458a8 100644 --- a/rust/ql/lib/codeql/rust/elements.qll +++ b/rust/ql/lib/codeql/rust/elements.qll @@ -182,15 +182,15 @@ import codeql.rust.elements.canonical_paths.CanonicalPath import codeql.rust.elements.canonical_paths.CanonicalPathElement import codeql.rust.elements.canonical_paths.ConcreteTypeCanonicalPath import codeql.rust.elements.canonical_paths.ConstGenericTypeArg -import codeql.rust.elements.canonical_paths.CrateRoot +import codeql.rust.elements.canonical_paths.CrateRef import codeql.rust.elements.canonical_paths.DerivedTypeCanonicalPath -import codeql.rust.elements.canonical_paths.LangCrateRoot +import codeql.rust.elements.canonical_paths.LangCrateRef import codeql.rust.elements.canonical_paths.ModuleItemCanonicalPath import codeql.rust.elements.canonical_paths.Namespace import codeql.rust.elements.canonical_paths.ParametrizedCanonicalPath import codeql.rust.elements.canonical_paths.PlaceholderTypeCanonicalPath -import codeql.rust.elements.canonical_paths.RepoCrateRoot -import codeql.rust.elements.canonical_paths.RustcCrateRoot +import codeql.rust.elements.canonical_paths.RepoCrateRef +import codeql.rust.elements.canonical_paths.RustcCrateRef import codeql.rust.elements.canonical_paths.TraitImplItemCanonicalPath import codeql.rust.elements.canonical_paths.TypeCanonicalPath import codeql.rust.elements.canonical_paths.TypeGenericArg diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/CrateRoot.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/CrateRoot.qll deleted file mode 100644 index 86b9ef456c3..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/CrateRoot.qll +++ /dev/null @@ -1,12 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the public class `CrateRoot`. - */ - -private import internal.CrateRootImpl -import codeql.rust.elements.canonical_paths.CanonicalPathElement - -/** - * The base class for all crate references. - */ -final class CrateRoot = Impl::CrateRoot; diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/LangCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/LangCrateRoot.qll deleted file mode 100644 index cac7ebacbb7..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/LangCrateRoot.qll +++ /dev/null @@ -1,12 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the public class `LangCrateRoot`. - */ - -private import internal.LangCrateRootImpl -import codeql.rust.elements.canonical_paths.CrateRoot - -/** - * A reference to a crate in the Rust standard libraries. - */ -final class LangCrateRoot = Impl::LangCrateRoot; diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/Namespace.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/Namespace.qll index 423abcb6db2..8a484f5f0ab 100644 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/Namespace.qll +++ b/rust/ql/lib/codeql/rust/elements/canonical_paths/Namespace.qll @@ -5,7 +5,7 @@ private import internal.NamespaceImpl import codeql.rust.elements.canonical_paths.CanonicalPath -import codeql.rust.elements.canonical_paths.CrateRoot +import codeql.rust.elements.canonical_paths.CrateRef /** * A namespace, comprised of a crate root and a possibly empty `::` separated module path. diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/RepoCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/RepoCrateRoot.qll deleted file mode 100644 index fb3ee1af1ec..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/RepoCrateRoot.qll +++ /dev/null @@ -1,13 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the public class `RepoCrateRoot`. - */ - -private import internal.RepoCrateRootImpl -import codeql.rust.elements.canonical_paths.CrateRoot -import codeql.files.FileSystem - -/** - * A reference to a crate in the repository. - */ -final class RepoCrateRoot = Impl::RepoCrateRoot; diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/RustcCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/RustcCrateRoot.qll deleted file mode 100644 index 88a08c25a5f..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/RustcCrateRoot.qll +++ /dev/null @@ -1,12 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the public class `RustcCrateRoot`. - */ - -private import internal.RustcCrateRootImpl -import codeql.rust.elements.canonical_paths.CrateRoot - -/** - * A reference to a crate provided by rustc. TODO: understand where these come from. - */ -final class RustcCrateRoot = Impl::RustcCrateRoot; diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/CrateRootImpl.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/CrateRootImpl.qll deleted file mode 100644 index 7af34574af0..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/CrateRootImpl.qll +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This module provides a hand-modifiable wrapper around the generated class `CrateRoot`. - * - * INTERNAL: Do not use. - */ - -private import codeql.rust.elements.internal.generated.canonical_paths.CrateRoot - -/** - * INTERNAL: This module contains the customizable definition of `CrateRoot` and should not - * be referenced directly. - */ -module Impl { - // the following QLdoc is generated: if you need to edit it, do it in the schema file - /** - * The base class for all crate references. - */ - class CrateRoot extends Generated::CrateRoot { - override string toString() { result = this.toAbbreviatedString() } - } -} diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootConstructor.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootConstructor.qll deleted file mode 100644 index a20445626d4..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootConstructor.qll +++ /dev/null @@ -1,14 +0,0 @@ -// generated by codegen, remove this comment if you wish to edit this file -/** - * This module defines the hook used internally to tweak the characteristic predicate of - * `LangCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ - -private import codeql.rust.elements.internal.generated.Raw - -/** - * The characteristic predicate of `LangCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ -predicate constructLangCrateRoot(Raw::LangCrateRoot id) { any() } diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootImpl.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootImpl.qll index e938b0101ef..cecbb61ef4a 100644 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootImpl.qll +++ b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/LangCrateRootImpl.qll @@ -1,13 +1,13 @@ /** - * This module provides a hand-modifiable wrapper around the generated class `LangCrateRoot`. + * This module provides a hand-modifiable wrapper around the generated class `LangCrateRef`. * * INTERNAL: Do not use. */ -private import codeql.rust.elements.internal.generated.canonical_paths.LangCrateRoot +private import codeql.rust.elements.internal.generated.canonical_paths.LangCrateRef /** - * INTERNAL: This module contains the customizable definition of `LangCrateRoot` and should not + * INTERNAL: This module contains the customizable definition of `LangCrateRef` and should not * be referenced directly. */ module Impl { @@ -15,7 +15,7 @@ module Impl { /** * A reference to a crate in the Rust standard libraries. */ - class LangCrateRoot extends Generated::LangCrateRoot { + class LangCrateRef extends Generated::LangCrateRef { override string toAbbreviatedString() { result = this.getName() } } } diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootConstructor.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootConstructor.qll deleted file mode 100644 index 14d8d9ba691..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootConstructor.qll +++ /dev/null @@ -1,14 +0,0 @@ -// generated by codegen, remove this comment if you wish to edit this file -/** - * This module defines the hook used internally to tweak the characteristic predicate of - * `RepoCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ - -private import codeql.rust.elements.internal.generated.Raw - -/** - * The characteristic predicate of `RepoCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ -predicate constructRepoCrateRoot(Raw::RepoCrateRoot id) { any() } diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootImpl.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootImpl.qll index 8eca80428f8..9e3fdce65ae 100644 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootImpl.qll +++ b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RepoCrateRootImpl.qll @@ -1,13 +1,13 @@ /** - * This module provides a hand-modifiable wrapper around the generated class `RepoCrateRoot`. + * This module provides a hand-modifiable wrapper around the generated class `RepoCrateRef`. * * INTERNAL: Do not use. */ -private import codeql.rust.elements.internal.generated.canonical_paths.RepoCrateRoot +private import codeql.rust.elements.internal.generated.canonical_paths.RepoCrateRef /** - * INTERNAL: This module contains the customizable definition of `RepoCrateRoot` and should not + * INTERNAL: This module contains the customizable definition of `RepoCrateRef` and should not * be referenced directly. */ module Impl { @@ -15,7 +15,7 @@ module Impl { /** * A reference to a crate in the repository. */ - class RepoCrateRoot extends Generated::RepoCrateRoot { + class RepoCrateRef extends Generated::RepoCrateRef { override string toAbbreviatedString() { result = this.getName() or diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootConstructor.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootConstructor.qll deleted file mode 100644 index 203ae02b7bf..00000000000 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootConstructor.qll +++ /dev/null @@ -1,14 +0,0 @@ -// generated by codegen, remove this comment if you wish to edit this file -/** - * This module defines the hook used internally to tweak the characteristic predicate of - * `RustcCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ - -private import codeql.rust.elements.internal.generated.Raw - -/** - * The characteristic predicate of `RustcCrateRoot` synthesized instances. - * INTERNAL: Do not use. - */ -predicate constructRustcCrateRoot(Raw::RustcCrateRoot id) { any() } diff --git a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootImpl.qll b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootImpl.qll index 8ab717b388b..49bdff234cf 100644 --- a/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootImpl.qll +++ b/rust/ql/lib/codeql/rust/elements/canonical_paths/internal/RustcCrateRootImpl.qll @@ -1,13 +1,13 @@ /** - * This module provides a hand-modifiable wrapper around the generated class `RustcCrateRoot`. + * This module provides a hand-modifiable wrapper around the generated class `RustcCrateRef`. * * INTERNAL: Do not use. */ -private import codeql.rust.elements.internal.generated.canonical_paths.RustcCrateRoot +private import codeql.rust.elements.internal.generated.canonical_paths.RustcCrateRef /** - * INTERNAL: This module contains the customizable definition of `RustcCrateRoot` and should not + * INTERNAL: This module contains the customizable definition of `RustcCrateRef` and should not * be referenced directly. */ module Impl { @@ -15,7 +15,7 @@ module Impl { /** * A reference to a crate provided by rustc. TODO: understand where these come from. */ - class RustcCrateRoot extends Generated::RustcCrateRoot { + class RustcCrateRef extends Generated::RustcCrateRef { override string toAbbreviatedString() { result = this.getName() } } } diff --git a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll index 6f6291df241..af946a987d5 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll @@ -24,5 +24,19 @@ module Impl { */ pragma[nomagic] predicate resolvesAsItem(Item i) { this.getResolvedCanonicalPath() = i.getCanonicalPath() } + + /** + * Splits the standard path this resolves into into its components (see `CanonicalPath::hasStandardPath/3`). + */ + predicate resolvesToStandardPath(string namespace, string type, string name) { + this.getResolvedCanonicalPath().hasStandardPath(namespace, type, name) + } + + /** + * Splits the standard path into its components (see `CanonicalPath::hasStandardPath/2`). + */ + predicate resolvesToStandardPath(string namespace, string name) { + this.getResolvedCanonicalPath().hasStandardPath(namespace, name) + } } } diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll index f35e05fa050..907fcd7d004 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll @@ -22,40 +22,6 @@ module Generated { * Use the subclass `Addressable`, where the following predicates are available. */ class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode { - /** - * Gets the extended canonical path of this addressable, if it exists. - * - * 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 getExtendedCanonicalPath() { - result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getExtendedCanonicalPath() - } - - /** - * Holds if `getExtendedCanonicalPath()` exists. - * INTERNAL: Do not use. - */ - final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) } - - /** - * Gets the crate origin of this addressable, if it exists. - * - * One of `rustc:`, `repo::` or `lang:`. - * INTERNAL: Do not use. - */ - string getCrateOrigin() { - result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getCrateOrigin() - } - - /** - * Holds if `getCrateOrigin()` exists. - * INTERNAL: Do not use. - */ - final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) } - /** * Gets the canonical path of this addressable, if it exists. * diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll index f30f49b65e2..89649c307b5 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll @@ -3770,7 +3770,7 @@ private module Impl { ) } - private Element getImmediateChildOfCrateRoot(CrateRoot e, int index, string partialPredicateCall) { + private Element getImmediateChildOfCrateRef(CrateRef e, int index, string partialPredicateCall) { exists(int b, int bCanonicalPathElement, int n | b = 0 and bCanonicalPathElement = @@ -3816,17 +3816,17 @@ private module Impl { ) } - private Element getImmediateChildOfLangCrateRoot( - LangCrateRoot e, int index, string partialPredicateCall + private Element getImmediateChildOfLangCrateRef( + LangCrateRef e, int index, string partialPredicateCall ) { - exists(int b, int bCrateRoot, int n | + exists(int b, int bCrateRef, int n | b = 0 and - bCrateRoot = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRoot(e, i, _)) | i) and - n = bCrateRoot and + bCrateRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRef(e, i, _)) | i) and + n = bCrateRef and ( none() or - result = getImmediateChildOfCrateRoot(e, index - b, partialPredicateCall) + result = getImmediateChildOfCrateRef(e, index - b, partialPredicateCall) ) ) } @@ -3834,29 +3834,35 @@ private module Impl { private Element getImmediateChildOfModuleItemCanonicalPath( ModuleItemCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nNamespace | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nNamespace = n + 1 and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getNamespace() and partialPredicateCall = "Namespace()" ) ) } private Element getImmediateChildOfNamespace(Namespace e, int index, string partialPredicateCall) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nRoot | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nRoot = n + 1 and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getRoot() and partialPredicateCall = "Root()" ) ) } @@ -3864,45 +3870,52 @@ private module Impl { private Element getImmediateChildOfParametrizedCanonicalPath( ParametrizedCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nBase, int nGenericArg | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nBase = n + 1 and + nGenericArg = nBase + 1 + max(int i | i = -1 or exists(e.getGenericArg(i)) | i) and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getBase() and partialPredicateCall = "Base()" + or + result = e.getGenericArg(index - nBase) and + partialPredicateCall = "GenericArg(" + (index - nBase).toString() + ")" ) ) } - private Element getImmediateChildOfRepoCrateRoot( - RepoCrateRoot e, int index, string partialPredicateCall + private Element getImmediateChildOfRepoCrateRef( + RepoCrateRef e, int index, string partialPredicateCall ) { - exists(int b, int bCrateRoot, int n | + exists(int b, int bCrateRef, int n | b = 0 and - bCrateRoot = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRoot(e, i, _)) | i) and - n = bCrateRoot and + bCrateRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRef(e, i, _)) | i) and + n = bCrateRef and ( none() or - result = getImmediateChildOfCrateRoot(e, index - b, partialPredicateCall) + result = getImmediateChildOfCrateRef(e, index - b, partialPredicateCall) ) ) } - private Element getImmediateChildOfRustcCrateRoot( - RustcCrateRoot e, int index, string partialPredicateCall + private Element getImmediateChildOfRustcCrateRef( + RustcCrateRef e, int index, string partialPredicateCall ) { - exists(int b, int bCrateRoot, int n | + exists(int b, int bCrateRef, int n | b = 0 and - bCrateRoot = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRoot(e, i, _)) | i) and - n = bCrateRoot and + bCrateRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCrateRef(e, i, _)) | i) and + n = bCrateRef and ( none() or - result = getImmediateChildOfCrateRoot(e, index - b, partialPredicateCall) + result = getImmediateChildOfCrateRef(e, index - b, partialPredicateCall) ) ) } @@ -3910,15 +3923,21 @@ private module Impl { private Element getImmediateChildOfTraitImplItemCanonicalPath( TraitImplItemCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nTypePath, int nTraitPath | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nTypePath = n + 1 and + nTraitPath = nTypePath + 1 and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getTypePath() and partialPredicateCall = "TypePath()" + or + index = nTypePath and result = e.getTraitPath() and partialPredicateCall = "TraitPath()" ) ) } @@ -3942,15 +3961,18 @@ private module Impl { private Element getImmediateChildOfTypeGenericTypeArg( TypeGenericTypeArg e, int index, string partialPredicateCall ) { - exists(int b, int bTypeGenericArg, int n | + exists(int b, int bTypeGenericArg, int n, int nPath | b = 0 and bTypeGenericArg = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeGenericArg(e, i, _)) | i) and n = bTypeGenericArg and + nPath = n + 1 and ( none() or result = getImmediateChildOfTypeGenericArg(e, index - b, partialPredicateCall) + or + index = n and result = e.getPath() and partialPredicateCall = "Path()" ) ) } @@ -3958,15 +3980,18 @@ private module Impl { private Element getImmediateChildOfTypeImplItemCanonicalPath( TypeImplItemCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nParent | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nParent = n + 1 and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getParent() and partialPredicateCall = "Parent()" ) ) } @@ -3974,15 +3999,18 @@ private module Impl { private Element getImmediateChildOfTypeItemCanonicalPath( TypeItemCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bCanonicalPath, int n | + exists(int b, int bCanonicalPath, int n, int nParent | b = 0 and bCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCanonicalPath(e, i, _)) | i) and n = bCanonicalPath and + nParent = n + 1 and ( none() or result = getImmediateChildOfCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getParent() and partialPredicateCall = "Parent()" ) ) } @@ -4006,15 +4034,18 @@ private module Impl { private Element getImmediateChildOfConcreteTypeCanonicalPath( ConcreteTypeCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bTypeCanonicalPath, int n | + exists(int b, int bTypeCanonicalPath, int n, int nPath | b = 0 and bTypeCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeCanonicalPath(e, i, _)) | i) and n = bTypeCanonicalPath and + nPath = n + 1 and ( none() or result = getImmediateChildOfTypeCanonicalPath(e, index - b, partialPredicateCall) + or + index = n and result = e.getPath() and partialPredicateCall = "Path()" ) ) } @@ -4022,15 +4053,19 @@ private module Impl { private Element getImmediateChildOfDerivedTypeCanonicalPath( DerivedTypeCanonicalPath e, int index, string partialPredicateCall ) { - exists(int b, int bTypeCanonicalPath, int n | + exists(int b, int bTypeCanonicalPath, int n, int nBase | b = 0 and bTypeCanonicalPath = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeCanonicalPath(e, i, _)) | i) and n = bTypeCanonicalPath and + nBase = n + 1 + max(int i | i = -1 or exists(e.getBase(i)) | i) and ( none() or result = getImmediateChildOfTypeCanonicalPath(e, index - b, partialPredicateCall) + or + result = e.getBase(index - n) and + partialPredicateCall = "Base(" + (index - n).toString() + ")" ) ) } @@ -4359,7 +4394,7 @@ private module Impl { or result = getImmediateChildOfConstGenericTypeArg(e, index, partialAccessor) or - result = getImmediateChildOfLangCrateRoot(e, index, partialAccessor) + result = getImmediateChildOfLangCrateRef(e, index, partialAccessor) or result = getImmediateChildOfModuleItemCanonicalPath(e, index, partialAccessor) or @@ -4367,9 +4402,9 @@ private module Impl { or result = getImmediateChildOfParametrizedCanonicalPath(e, index, partialAccessor) or - result = getImmediateChildOfRepoCrateRoot(e, index, partialAccessor) + result = getImmediateChildOfRepoCrateRef(e, index, partialAccessor) or - result = getImmediateChildOfRustcCrateRoot(e, index, partialAccessor) + result = getImmediateChildOfRustcCrateRef(e, index, partialAccessor) or result = getImmediateChildOfTraitImplItemCanonicalPath(e, index, partialAccessor) or 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 fd16c5ebdda..1cbd2bd9681 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll @@ -92,22 +92,6 @@ module Raw { * TODO: This does not yet include all possible cases. */ class Addressable extends @addressable, AstNode { - /** - * Gets the extended canonical path of this addressable, if it exists. - * - * 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 getExtendedCanonicalPath() { addressable_extended_canonical_paths(this, result) } - - /** - * Gets the crate origin of this addressable, if it exists. - * - * One of `rustc:`, `repo::` or `lang:`. - */ - string getCrateOrigin() { addressable_crate_origins(this, result) } - /** * Gets the canonical path of this addressable, if it exists. */ @@ -835,16 +819,6 @@ module Raw { * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`. */ class Resolvable extends @resolvable, AstNode { - /** - * Gets the resolved path of this resolvable, if it exists. - */ - string getResolvedPath() { resolvable_resolved_paths(this, result) } - - /** - * Gets the resolved crate origin of this resolvable, if it exists. - */ - string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) } - /** * Gets the resolved canonical path of this resolvable, if it exists. */ @@ -3985,7 +3959,7 @@ module Raw { * INTERNAL: Do not use. * The base class for all crate references. */ - class CrateRoot extends @crate_root, CanonicalPathElement { } + class CrateRef extends @crate_ref, CanonicalPathElement { } /** * INTERNAL: Do not use. @@ -4010,13 +3984,13 @@ module Raw { * INTERNAL: Do not use. * A reference to a crate in the Rust standard libraries. */ - class LangCrateRoot extends @lang_crate_root, CrateRoot { - override string toString() { result = "LangCrateRoot" } + class LangCrateRef extends @lang_crate_ref, CrateRef { + override string toString() { result = "LangCrateRef" } /** - * Gets the name of this lang crate root. + * Gets the name of this lang crate reference. */ - string getName() { lang_crate_roots(this, result) } + string getName() { lang_crate_refs(this, result) } } /** @@ -4047,7 +4021,7 @@ module Raw { /** * Gets the root of this namespace. */ - CrateRoot getRoot() { namespaces(this, result, _) } + CrateRef getRoot() { namespaces(this, result, _) } /** * Gets the path of this namespace. @@ -4078,36 +4052,36 @@ module Raw { * INTERNAL: Do not use. * A reference to a crate in the repository. */ - class RepoCrateRoot extends @repo_crate_root, CrateRoot { - override string toString() { result = "RepoCrateRoot" } + class RepoCrateRef extends @repo_crate_ref, CrateRef { + override string toString() { result = "RepoCrateRef" } /** - * Gets the name of this repo crate root, if it exists. + * Gets the name of this repo crate reference, if it exists. */ - string getName() { repo_crate_root_names(this, result) } + string getName() { repo_crate_ref_names(this, result) } /** - * Gets the repo of this repo crate root, if it exists. + * Gets the repo of this repo crate reference, if it exists. */ - string getRepo() { repo_crate_root_repos(this, result) } + string getRepo() { repo_crate_ref_repos(this, result) } /** - * Gets the source of this repo crate root. + * Gets the source of this repo crate reference. */ - File getSource() { repo_crate_roots(this, result) } + File getSource() { repo_crate_refs(this, result) } } /** * INTERNAL: Do not use. * A reference to a crate provided by rustc. TODO: understand where these come from. */ - class RustcCrateRoot extends @rustc_crate_root, CrateRoot { - override string toString() { result = "RustcCrateRoot" } + class RustcCrateRef extends @rustc_crate_ref, CrateRef { + override string toString() { result = "RustcCrateRef" } /** - * Gets the name of this rustc crate root. + * Gets the name of this rustc crate reference. */ - string getName() { rustc_crate_roots(this, result) } + string getName() { rustc_crate_refs(this, result) } } /** diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll index 038fc10415f..16e2b85195e 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll @@ -20,36 +20,6 @@ module Generated { * Use the subclass `Resolvable`, where the following predicates are available. */ class Resolvable extends Synth::TResolvable, AstNodeImpl::AstNode { - /** - * Gets the resolved path of this resolvable, if it exists. - * - * INTERNAL: Do not use. - */ - string getResolvedPath() { - result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedPath() - } - - /** - * Holds if `getResolvedPath()` exists. - * INTERNAL: Do not use. - */ - final predicate hasResolvedPath() { exists(this.getResolvedPath()) } - - /** - * Gets the resolved crate origin of this resolvable, if it exists. - * - * INTERNAL: Do not use. - */ - string getResolvedCrateOrigin() { - result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedCrateOrigin() - } - - /** - * Holds if `getResolvedCrateOrigin()` exists. - * INTERNAL: Do not use. - */ - final predicate hasResolvedCrateOrigin() { exists(this.getResolvedCrateOrigin()) } - /** * Gets the resolved canonical path of this resolvable, if it exists. * diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll index d6aa7c2994d..9960a3a7207 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll @@ -647,7 +647,7 @@ module Synth { /** * INTERNAL: Do not use. */ - TLangCrateRoot(Raw::LangCrateRoot id) { constructLangCrateRoot(id) } or + TLangCrateRef(Raw::LangCrateRef id) { constructLangCrateRef(id) } or /** * INTERNAL: Do not use. */ @@ -673,11 +673,11 @@ module Synth { /** * INTERNAL: Do not use. */ - TRepoCrateRoot(Raw::RepoCrateRoot id) { constructRepoCrateRoot(id) } or + TRepoCrateRef(Raw::RepoCrateRef id) { constructRepoCrateRef(id) } or /** * INTERNAL: Do not use. */ - TRustcCrateRoot(Raw::RustcCrateRoot id) { constructRustcCrateRoot(id) } or + TRustcCrateRef(Raw::RustcCrateRef id) { constructRustcCrateRef(id) } or /** * INTERNAL: Do not use. */ @@ -855,12 +855,12 @@ module Synth { /** * INTERNAL: Do not use. */ - class TCanonicalPathElement = TCanonicalPath or TCrateRoot or TTypeGenericArg; + class TCanonicalPathElement = TCanonicalPath or TCrateRef or TTypeGenericArg; /** * INTERNAL: Do not use. */ - class TCrateRoot = TLangCrateRoot or TRepoCrateRoot or TRustcCrateRoot; + class TCrateRef = TLangCrateRef or TRepoCrateRef or TRustcCrateRef; /** * INTERNAL: Do not use. @@ -1818,9 +1818,9 @@ module Synth { /** * INTERNAL: Do not use. - * Converts a raw element to a synthesized `TLangCrateRoot`, if possible. + * Converts a raw element to a synthesized `TLangCrateRef`, if possible. */ - TLangCrateRoot convertLangCrateRootFromRaw(Raw::Element e) { result = TLangCrateRoot(e) } + TLangCrateRef convertLangCrateRefFromRaw(Raw::Element e) { result = TLangCrateRef(e) } /** * INTERNAL: Do not use. @@ -1854,15 +1854,15 @@ module Synth { /** * INTERNAL: Do not use. - * Converts a raw element to a synthesized `TRepoCrateRoot`, if possible. + * Converts a raw element to a synthesized `TRepoCrateRef`, if possible. */ - TRepoCrateRoot convertRepoCrateRootFromRaw(Raw::Element e) { result = TRepoCrateRoot(e) } + TRepoCrateRef convertRepoCrateRefFromRaw(Raw::Element e) { result = TRepoCrateRef(e) } /** * INTERNAL: Do not use. - * Converts a raw element to a synthesized `TRustcCrateRoot`, if possible. + * Converts a raw element to a synthesized `TRustcCrateRef`, if possible. */ - TRustcCrateRoot convertRustcCrateRootFromRaw(Raw::Element e) { result = TRustcCrateRoot(e) } + TRustcCrateRef convertRustcCrateRefFromRaw(Raw::Element e) { result = TRustcCrateRef(e) } /** * INTERNAL: Do not use. @@ -2455,21 +2455,21 @@ module Synth { TCanonicalPathElement convertCanonicalPathElementFromRaw(Raw::Element e) { result = convertCanonicalPathFromRaw(e) or - result = convertCrateRootFromRaw(e) + result = convertCrateRefFromRaw(e) or result = convertTypeGenericArgFromRaw(e) } /** * INTERNAL: Do not use. - * Converts a raw DB element to a synthesized `TCrateRoot`, if possible. + * Converts a raw DB element to a synthesized `TCrateRef`, if possible. */ - TCrateRoot convertCrateRootFromRaw(Raw::Element e) { - result = convertLangCrateRootFromRaw(e) + TCrateRef convertCrateRefFromRaw(Raw::Element e) { + result = convertLangCrateRefFromRaw(e) or - result = convertRepoCrateRootFromRaw(e) + result = convertRepoCrateRefFromRaw(e) or - result = convertRustcCrateRootFromRaw(e) + result = convertRustcCrateRefFromRaw(e) } /** @@ -3438,9 +3438,9 @@ module Synth { /** * INTERNAL: Do not use. - * Converts a synthesized `TLangCrateRoot` to a raw DB element, if possible. + * Converts a synthesized `TLangCrateRef` to a raw DB element, if possible. */ - Raw::Element convertLangCrateRootToRaw(TLangCrateRoot e) { e = TLangCrateRoot(result) } + Raw::Element convertLangCrateRefToRaw(TLangCrateRef e) { e = TLangCrateRef(result) } /** * INTERNAL: Do not use. @@ -3474,15 +3474,15 @@ module Synth { /** * INTERNAL: Do not use. - * Converts a synthesized `TRepoCrateRoot` to a raw DB element, if possible. + * Converts a synthesized `TRepoCrateRef` to a raw DB element, if possible. */ - Raw::Element convertRepoCrateRootToRaw(TRepoCrateRoot e) { e = TRepoCrateRoot(result) } + Raw::Element convertRepoCrateRefToRaw(TRepoCrateRef e) { e = TRepoCrateRef(result) } /** * INTERNAL: Do not use. - * Converts a synthesized `TRustcCrateRoot` to a raw DB element, if possible. + * Converts a synthesized `TRustcCrateRef` to a raw DB element, if possible. */ - Raw::Element convertRustcCrateRootToRaw(TRustcCrateRoot e) { e = TRustcCrateRoot(result) } + Raw::Element convertRustcCrateRefToRaw(TRustcCrateRef e) { e = TRustcCrateRef(result) } /** * INTERNAL: Do not use. @@ -4075,21 +4075,21 @@ module Synth { Raw::Element convertCanonicalPathElementToRaw(TCanonicalPathElement e) { result = convertCanonicalPathToRaw(e) or - result = convertCrateRootToRaw(e) + result = convertCrateRefToRaw(e) or result = convertTypeGenericArgToRaw(e) } /** * INTERNAL: Do not use. - * Converts a synthesized `TCrateRoot` to a raw DB element, if possible. + * Converts a synthesized `TCrateRef` to a raw DB element, if possible. */ - Raw::Element convertCrateRootToRaw(TCrateRoot e) { - result = convertLangCrateRootToRaw(e) + Raw::Element convertCrateRefToRaw(TCrateRef e) { + result = convertLangCrateRefToRaw(e) or - result = convertRepoCrateRootToRaw(e) + result = convertRepoCrateRefToRaw(e) or - result = convertRustcCrateRootToRaw(e) + result = convertRustcCrateRefToRaw(e) } /** diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll index 8e637dc12c4..98f06029d7f 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll @@ -157,13 +157,13 @@ import codeql.rust.elements.canonical_paths.internal.BuiltinTypeCanonicalPathCon import codeql.rust.elements.canonical_paths.internal.ConcreteTypeCanonicalPathConstructor import codeql.rust.elements.canonical_paths.internal.ConstGenericTypeArgConstructor import codeql.rust.elements.canonical_paths.internal.DerivedTypeCanonicalPathConstructor -import codeql.rust.elements.canonical_paths.internal.LangCrateRootConstructor +import codeql.rust.elements.canonical_paths.internal.LangCrateRefConstructor import codeql.rust.elements.canonical_paths.internal.ModuleItemCanonicalPathConstructor import codeql.rust.elements.canonical_paths.internal.NamespaceConstructor import codeql.rust.elements.canonical_paths.internal.ParametrizedCanonicalPathConstructor import codeql.rust.elements.canonical_paths.internal.PlaceholderTypeCanonicalPathConstructor -import codeql.rust.elements.canonical_paths.internal.RepoCrateRootConstructor -import codeql.rust.elements.canonical_paths.internal.RustcCrateRootConstructor +import codeql.rust.elements.canonical_paths.internal.RepoCrateRefConstructor +import codeql.rust.elements.canonical_paths.internal.RustcCrateRefConstructor import codeql.rust.elements.canonical_paths.internal.TraitImplItemCanonicalPathConstructor import codeql.rust.elements.canonical_paths.internal.TypeGenericTypeArgConstructor import codeql.rust.elements.canonical_paths.internal.TypeImplItemCanonicalPathConstructor diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRoot.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRoot.qll deleted file mode 100644 index f02f550d350..00000000000 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/CrateRoot.qll +++ /dev/null @@ -1,22 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the generated definition of `CrateRoot`. - * INTERNAL: Do not import directly. - */ - -private import codeql.rust.elements.internal.generated.Synth -private import codeql.rust.elements.internal.generated.Raw -import codeql.rust.elements.canonical_paths.internal.CanonicalPathElementImpl::Impl as CanonicalPathElementImpl - -/** - * INTERNAL: This module contains the fully generated definition of `CrateRoot` and should not - * be referenced directly. - */ -module Generated { - /** - * The base class for all crate references. - * INTERNAL: Do not reference the `Generated::CrateRoot` class directly. - * Use the subclass `CrateRoot`, where the following predicates are available. - */ - class CrateRoot extends Synth::TCrateRoot, CanonicalPathElementImpl::CanonicalPathElement { } -} diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRoot.qll deleted file mode 100644 index 8660df34609..00000000000 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/LangCrateRoot.qll +++ /dev/null @@ -1,31 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the generated definition of `LangCrateRoot`. - * INTERNAL: Do not import directly. - */ - -private import codeql.rust.elements.internal.generated.Synth -private import codeql.rust.elements.internal.generated.Raw -import codeql.rust.elements.canonical_paths.internal.CrateRootImpl::Impl as CrateRootImpl - -/** - * INTERNAL: This module contains the fully generated definition of `LangCrateRoot` and should not - * be referenced directly. - */ -module Generated { - /** - * A reference to a crate in the Rust standard libraries. - * INTERNAL: Do not reference the `Generated::LangCrateRoot` class directly. - * Use the subclass `LangCrateRoot`, where the following predicates are available. - */ - class LangCrateRoot extends Synth::TLangCrateRoot, CrateRootImpl::CrateRoot { - override string getAPrimaryQlClass() { result = "LangCrateRoot" } - - /** - * Gets the name of this lang crate root. - */ - string getName() { - result = Synth::convertLangCrateRootToRaw(this).(Raw::LangCrateRoot).getName() - } - } -} diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll index 7251fc68e17..1d43e90ca87 100644 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll +++ b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/Namespace.qll @@ -7,7 +7,7 @@ private import codeql.rust.elements.internal.generated.Synth private import codeql.rust.elements.internal.generated.Raw import codeql.rust.elements.canonical_paths.internal.CanonicalPathImpl::Impl as CanonicalPathImpl -import codeql.rust.elements.canonical_paths.CrateRoot +import codeql.rust.elements.canonical_paths.CrateRef /** * INTERNAL: This module contains the fully generated definition of `Namespace` and should not @@ -25,9 +25,9 @@ module Generated { /** * Gets the root of this namespace. */ - CrateRoot getRoot() { + CrateRef getRoot() { result = - Synth::convertCrateRootFromRaw(Synth::convertNamespaceToRaw(this).(Raw::Namespace).getRoot()) + Synth::convertCrateRefFromRaw(Synth::convertNamespaceToRaw(this).(Raw::Namespace).getRoot()) } /** diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRoot.qll deleted file mode 100644 index 081fcbba215..00000000000 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RepoCrateRoot.qll +++ /dev/null @@ -1,56 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the generated definition of `RepoCrateRoot`. - * INTERNAL: Do not import directly. - */ - -private import codeql.rust.elements.internal.generated.Synth -private import codeql.rust.elements.internal.generated.Raw -import codeql.rust.elements.canonical_paths.internal.CrateRootImpl::Impl as CrateRootImpl -import codeql.files.FileSystem - -/** - * INTERNAL: This module contains the fully generated definition of `RepoCrateRoot` and should not - * be referenced directly. - */ -module Generated { - /** - * A reference to a crate in the repository. - * INTERNAL: Do not reference the `Generated::RepoCrateRoot` class directly. - * Use the subclass `RepoCrateRoot`, where the following predicates are available. - */ - class RepoCrateRoot extends Synth::TRepoCrateRoot, CrateRootImpl::CrateRoot { - override string getAPrimaryQlClass() { result = "RepoCrateRoot" } - - /** - * Gets the name of this repo crate root, if it exists. - */ - string getName() { - result = Synth::convertRepoCrateRootToRaw(this).(Raw::RepoCrateRoot).getName() - } - - /** - * Holds if `getName()` exists. - */ - final predicate hasName() { exists(this.getName()) } - - /** - * Gets the repo of this repo crate root, if it exists. - */ - string getRepo() { - result = Synth::convertRepoCrateRootToRaw(this).(Raw::RepoCrateRoot).getRepo() - } - - /** - * Holds if `getRepo()` exists. - */ - final predicate hasRepo() { exists(this.getRepo()) } - - /** - * Gets the source of this repo crate root. - */ - File getSource() { - result = Synth::convertRepoCrateRootToRaw(this).(Raw::RepoCrateRoot).getSource() - } - } -} diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRoot.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRoot.qll deleted file mode 100644 index d5f9c69c82f..00000000000 --- a/rust/ql/lib/codeql/rust/elements/internal/generated/canonical_paths/RustcCrateRoot.qll +++ /dev/null @@ -1,31 +0,0 @@ -// generated by codegen, do not edit -/** - * This module provides the generated definition of `RustcCrateRoot`. - * INTERNAL: Do not import directly. - */ - -private import codeql.rust.elements.internal.generated.Synth -private import codeql.rust.elements.internal.generated.Raw -import codeql.rust.elements.canonical_paths.internal.CrateRootImpl::Impl as CrateRootImpl - -/** - * INTERNAL: This module contains the fully generated definition of `RustcCrateRoot` and should not - * be referenced directly. - */ -module Generated { - /** - * A reference to a crate provided by rustc. TODO: understand where these come from. - * INTERNAL: Do not reference the `Generated::RustcCrateRoot` class directly. - * Use the subclass `RustcCrateRoot`, where the following predicates are available. - */ - class RustcCrateRoot extends Synth::TRustcCrateRoot, CrateRootImpl::CrateRoot { - override string getAPrimaryQlClass() { result = "RustcCrateRoot" } - - /** - * Gets the name of this rustc crate root. - */ - string getName() { - result = Synth::convertRustcCrateRootToRaw(this).(Raw::RustcCrateRoot).getName() - } - } -} diff --git a/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll b/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll index 2d3e04f94b3..b62498702f8 100644 --- a/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll +++ b/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll @@ -12,8 +12,7 @@ private class ReqwestGet extends RemoteSource::Range { ReqwestGet() { exists(CallExpr ce | this.asExpr().getExpr() = ce and - ce.getFunction().(PathExpr).getResolvedCrateOrigin().matches("%reqwest") and - ce.getFunction().(PathExpr).getResolvedPath() = ["crate::get", "crate::blocking::get"] + ce.getFunction().(PathExpr).resolvesToStandardPath(["reqwest", "reqwest::blocking"], "get") ) } } diff --git a/rust/ql/lib/codeql/rust/frameworks/RustCrypto.qll b/rust/ql/lib/codeql/rust/frameworks/RustCrypto.qll index 9dd40004766..0428491bda1 100644 --- a/rust/ql/lib/codeql/rust/frameworks/RustCrypto.qll +++ b/rust/ql/lib/codeql/rust/frameworks/RustCrypto.qll @@ -22,28 +22,22 @@ class StreamCipherInit extends Cryptography::CryptographicOperation::Range { StreamCipherInit() { // a call to `cipher::KeyInit::new`, `cipher::KeyInit::new_from_slice`, // `cipher::KeyIvInit::new`, `cipher::KeyIvInit::new_from_slices` or `rc2::Rc2::new_with_eff_key_len`. - exists(PathExpr p, string rawAlgorithmName | - this.asExpr().getExpr().(CallExpr).getFunction() = p and - p.getResolvedCrateOrigin().matches("%/RustCrypto%") and - p.getPath().getPart().getNameRef().getText() = - ["new", "new_from_slice", "new_from_slices", "new_with_eff_key_len"] and - ( - rawAlgorithmName = p.getPath().getQualifier().getPart().getNameRef().getText() or - rawAlgorithmName = - p.getPath() - .getQualifier() - .getPart() - .getGenericArgList() - .getGenericArg(0) - .(TypeArg) - .getTypeRepr() - .(PathTypeRepr) - .getPath() - .getPart() - .getNameRef() - .getText() - ) and - algorithmName = simplifyAlgorithmName(rawAlgorithmName) + exists(PathExpr e | + e = this.asExpr().getExpr().(CallExpr).getFunction() and + exists(TraitImplItemCanonicalPath path, string rawAlgorithmName | + path = e.getResolvedCanonicalPath() and + path.getTraitPath().getBase().hasStandardPath("crypto-common", ["KeyInit", "KeyIvInit"]) and + path.getName() = ["new", "new_from_slice", "new_from_slices"] and + path.getTypePath() + .(ConcreteTypeCanonicalPath) + .getPath() + .getBase() + .hasStandardPath(_, rawAlgorithmName) and + algorithmName = simplifyAlgorithmName(rawAlgorithmName) + ) + or + e.resolvesToStandardPath("rc2::Rc2", "new_with_eff_key_len") and + algorithmName = "Rc2" ) } diff --git a/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll b/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll index 5504993ab74..b297e620c32 100644 --- a/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll +++ b/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll @@ -14,12 +14,15 @@ private class SqlxQuery extends SqlConstruction::Range { SqlxQuery() { this.asExpr().getExpr() = call and - call.getFunction().(PathExpr).getResolvedPath() = - [ - "crate::query::query", "crate::query_as::query_as", "crate::query_with::query_with", - "crate::query_as_with::query_as_with", "crate::query_scalar::query_scalar", - "crate::query_scalar_with::query_scalar_with", "crate::raw_sql::raw_sql" - ] + exists(PathExpr path, string name | + call.getFunction() = path and + name = + [ + "query", "query_as", "query_with", "query_as_with", "query_scalar", "query_scalar_with", + "raw_sql" + ] and + path.resolvesToStandardPath("sqlx::" + name, name) + ) } override DataFlow::Node getSql() { result.asExpr().getExpr() = call.getArgList().getArg(0) } @@ -33,7 +36,7 @@ private class SqlxExecute extends SqlExecution::Range { SqlxExecute() { this.asExpr().getExpr() = call and - call.(Resolvable).getResolvedPath() = "crate::executor::Executor::execute" + call.(Resolvable).resolvesToStandardPath("sqlx::executor", "Executor", "execute") } override DataFlow::Node getSql() { result.asExpr().getExpr() = call.getArgList().getArg(0) } diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll index 8410da77a06..547b4b08f51 100644 --- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll +++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll @@ -10,8 +10,12 @@ private import codeql.rust.Concepts */ private class StdEnvArgs extends CommandLineArgsSource::Range { StdEnvArgs() { - this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getResolvedPath() = - ["crate::env::args", "crate::env::args_os"] + this.asExpr() + .getExpr() + .(CallExpr) + .getFunction() + .(PathExpr) + .resolvesToStandardPath("std::env", ["args", "args_os"]) } } @@ -20,8 +24,12 @@ private class StdEnvArgs extends CommandLineArgsSource::Range { */ private class StdEnvDir extends CommandLineArgsSource::Range { StdEnvDir() { - this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getResolvedPath() = - ["crate::env::current_dir", "crate::env::current_exe", "crate::env::home_dir"] + this.asExpr() + .getExpr() + .(CallExpr) + .getFunction() + .(PathExpr) + .resolvesToStandardPath("std::env", ["current_dir", "current_exe", "home_dir"]) } } @@ -30,7 +38,11 @@ private class StdEnvDir extends CommandLineArgsSource::Range { */ private class StdEnvVar extends EnvironmentSource::Range { StdEnvVar() { - this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getResolvedPath() = - ["crate::env::var", "crate::env::var_os", "crate::env::vars", "crate::env::vars_os"] + this.asExpr() + .getExpr() + .(CallExpr) + .getFunction() + .(PathExpr) + .resolvesToStandardPath("std::env", ["var", "var_os", "vars", "vars_os"]) } } diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme index c7170e67601..904b4212d99 100644 --- a/rust/ql/lib/rust.dbscheme +++ b/rust/ql/lib/rust.dbscheme @@ -226,18 +226,6 @@ abi_abi_strings( | @variant ; -#keyset[id] -addressable_extended_canonical_paths( - int id: @addressable ref, - string extended_canonical_path: string ref -); - -#keyset[id] -addressable_crate_origins( - int id: @addressable ref, - string crate_origin: string ref -); - #keyset[id] addressable_canonical_paths( int id: @addressable ref, @@ -861,18 +849,6 @@ rename_names( | @path_ast_node ; -#keyset[id] -resolvable_resolved_paths( - int id: @resolvable ref, - string resolved_path: string ref -); - -#keyset[id] -resolvable_resolved_crate_origins( - int id: @resolvable ref, - string resolved_crate_origin: string ref -); - #keyset[id] resolvable_resolved_canonical_paths( int id: @resolvable ref, @@ -3356,7 +3332,7 @@ while_expr_conditions( @canonical_path_element = @canonical_path -| @crate_root +| @crate_ref | @type_generic_arg ; @@ -3370,10 +3346,10 @@ while_expr_conditions( | @type_item_canonical_path ; -@crate_root = - @lang_crate_root -| @repo_crate_root -| @rustc_crate_root +@crate_ref = + @lang_crate_ref +| @repo_crate_ref +| @rustc_crate_ref ; @type_generic_arg = @@ -3386,8 +3362,8 @@ const_generic_type_args( //dir=canonical_paths string value: string ref ); -lang_crate_roots( //dir=canonical_paths - unique int id: @lang_crate_root, +lang_crate_refs( //dir=canonical_paths + unique int id: @lang_crate_ref, string name: string ref ); @@ -3399,7 +3375,7 @@ module_item_canonical_paths( //dir=canonical_paths namespaces( //dir=canonical_paths unique int id: @namespace, - int root: @crate_root ref, + int root: @crate_ref ref, string path: string ref ); @@ -3415,25 +3391,25 @@ parametrized_canonical_path_generic_args( //dir=canonical_paths int generic_arg: @type_generic_arg ref ); -repo_crate_roots( //dir=canonical_paths - unique int id: @repo_crate_root, +repo_crate_refs( //dir=canonical_paths + unique int id: @repo_crate_ref, int source: @file ref ); #keyset[id] -repo_crate_root_names( //dir=canonical_paths - int id: @repo_crate_root ref, +repo_crate_ref_names( //dir=canonical_paths + int id: @repo_crate_ref ref, string name: string ref ); #keyset[id] -repo_crate_root_repos( //dir=canonical_paths - int id: @repo_crate_root ref, +repo_crate_ref_repos( //dir=canonical_paths + int id: @repo_crate_ref ref, string repo: string ref ); -rustc_crate_roots( //dir=canonical_paths - unique int id: @rustc_crate_root, +rustc_crate_refs( //dir=canonical_paths + unique int id: @rustc_crate_ref, string name: string ref ); diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql index 221b8e4eb09..a50027dfe81 100644 --- a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql +++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql @@ -32,8 +32,12 @@ class CtorAttr extends Attr { */ class StdCall extends Expr { StdCall() { - this.(CallExpr).getFunction().(PathExpr).getResolvedCrateOrigin() = "lang:std" or - this.(MethodCallExpr).getResolvedCrateOrigin() = "lang:std" + exists(string namespace | + this.(CallExpr).getFunction().(PathExpr).resolvesToStandardPath(namespace, _) + or + this.(MethodCallExpr).resolvesToStandardPath(namespace, _, _) and + namespace.matches("std::%") + ) } } diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected index b00afc2649b..3bb1bc9744e 100644 --- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected +++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected @@ -1,132 +1,141 @@ canonicalPaths -| anonymous.rs:1:1:1:26 | Use | None | -| anonymous.rs:3:1:32:1 | fn canonicals | ...::canonicals | -| anonymous.rs:4:5:4:23 | struct OtherStruct | None | -| anonymous.rs:6:5:8:5 | trait OtherTrait | None | -| anonymous.rs:7:9:7:20 | fn g | None | -| anonymous.rs:10:5:12:5 | impl OtherTrait for OtherStruct { ... } | None | -| anonymous.rs:11:9:11:22 | fn g | None | -| anonymous.rs:14:5:16:5 | impl OtherTrait for ...::Struct { ... } | None | -| anonymous.rs:15:9:15:22 | fn g | <...>::g | -| anonymous.rs:18:5:20:5 | impl ...::Trait for OtherStruct { ... } | None | -| anonymous.rs:19:9:19:22 | fn f | None | -| anonymous.rs:22:5:24:5 | fn nested | None | -| anonymous.rs:23:9:23:27 | struct OtherStruct | None | -| anonymous.rs:26:5:31:5 | fn usage | None | -| anonymous.rs:34:1:36:1 | fn other | ...::other | -| anonymous.rs:35:5:35:23 | struct OtherStruct | None | -| lib.rs:1:1:1:14 | mod anonymous | test::anonymous | -| lib.rs:2:1:2:12 | mod regular | test::regular | -| lib.rs:3:1:3:10 | mod usage | test::usage | -| regular.rs:1:1:2:18 | struct Struct | ...::Struct | -| regular.rs:4:1:6:1 | trait Trait | ...::Trait | -| regular.rs:5:5:5:16 | fn f | ...::f | -| regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | -| regular.rs:9:5:9:18 | fn f | <... as ...>::f | -| regular.rs:12:1:14:1 | impl Struct { ... } | None | -| regular.rs:13:5:13:22 | fn g | <...>::g | -| regular.rs:16:1:18:1 | trait TraitWithBlanketImpl | ...::TraitWithBlanketImpl | -| regular.rs:17:5:17:16 | fn h | ...::h | -| regular.rs:20:1:22:1 | impl TraitWithBlanketImpl for T { ... } | None | -| regular.rs:21:5:21:18 | fn h | <_ as ...>::h | -| regular.rs:24:1:24:16 | fn free | ...::free | -| regular.rs:26:1:30:1 | enum MyEnum | ...::MyEnum | -| regular.rs:27:5:27:12 | Variant1 | ...::Variant1 | -| regular.rs:28:5:28:19 | Variant2 | ...::Variant2 | -| regular.rs:29:5:29:25 | Variant3 | ...::Variant3 | -| regular.rs:32:1:34:1 | trait GenericTrait | ...::GenericTrait | -| regular.rs:33:5:33:35 | fn generic_method | ...::generic_method | -| regular.rs:36:1:39:1 | struct GenericStruct | ...::GenericStruct | -| regular.rs:41:1:41:50 | struct GenericTupleStruct | ...::GenericTupleStruct | -| regular.rs:44:1:47:1 | enum GenericEnum | ...::GenericEnum | -| regular.rs:45:5:45:8 | T | ...::T | -| regular.rs:46:5:46:8 | U | ...::U | -| regular.rs:49:1:51:1 | impl GenericTrait::<...> for GenericStruct::<...> { ... } | None | -| regular.rs:50:5:50:37 | fn generic_method | <... as ...>::generic_method | -| regular.rs:53:1:55:1 | impl GenericTrait::<...> for GenericStruct::<...> { ... } | None | -| regular.rs:54:5:54:39 | fn generic_method | <... as ...>::generic_method | -| regular.rs:57:1:59:1 | impl GenericTrait::<...> for GenericTupleStruct::<...> { ... } | None | -| regular.rs:58:5:58:37 | fn generic_method | <... as ...>::generic_method | -| regular.rs:61:1:63:1 | impl GenericTrait::<...> for GenericTupleStruct::<...> { ... } | None | -| regular.rs:62:5:62:39 | fn generic_method | <... as ...>::generic_method | -| regular.rs:65:1:67:1 | impl GenericTrait::<...> for GenericEnum::<...> { ... } | None | -| regular.rs:66:5:66:37 | fn generic_method | <... as ...>::generic_method | -| regular.rs:69:1:71:1 | impl GenericTrait::<...> for GenericEnum::<...> { ... } | None | -| regular.rs:70:5:70:39 | fn generic_method | <... as ...>::generic_method | -| regular.rs:73:1:75:1 | impl Trait for ... { ... } | None | -| regular.rs:74:5:74:18 | fn f | <... as ...>::f | -| regular.rs:77:1:79:1 | impl Trait for ... { ... } | None | -| regular.rs:78:5:78:18 | fn f | <... as ...>::f | -| regular.rs:81:1:83:1 | impl Trait for ... { ... } | None | -| regular.rs:82:5:82:18 | fn f | <... as ...>::f | -| regular.rs:85:1:87:1 | impl Trait for ... { ... } | None | -| regular.rs:86:5:86:18 | fn f | <... as ...>::f | -| regular.rs:89:1:91:1 | impl Trait for ... { ... } | None | -| regular.rs:90:5:90:18 | fn f | <... as ...>::f | -| usage.rs:1:1:1:22 | Use | None | -| usage.rs:3:1:9:1 | fn usage | ...::usage | -| usage.rs:11:1:17:1 | fn enum_qualified_usage | ...::enum_qualified_usage | -| usage.rs:19:1:26:1 | fn enum_unqualified_usage | ...::enum_unqualified_usage | -| usage.rs:22:5:22:18 | Use | None | -| usage.rs:28:1:34:1 | fn enum_match | ...::enum_match | -| usage.rs:36:1:49:1 | fn generic_usage | ...::generic_usage | -| usage.rs:51:1:57:1 | fn use_trait | ...::use_trait | -| usage.rs:54:5:54:17 | vec!... | None | +| anonymous.rs:1:1:1:26 | Use | None | | +| anonymous.rs:3:1:32:1 | fn canonicals | ...::canonicals | ModuleItemCanonicalPath | +| anonymous.rs:4:5:4:23 | struct OtherStruct | None | | +| anonymous.rs:6:5:8:5 | trait OtherTrait | None | | +| anonymous.rs:7:9:7:20 | fn g | None | | +| anonymous.rs:10:5:12:5 | impl OtherTrait for OtherStruct { ... } | None | | +| anonymous.rs:11:9:11:22 | fn g | None | | +| anonymous.rs:14:5:16:5 | impl OtherTrait for ...::Struct { ... } | None | | +| anonymous.rs:15:9:15:22 | fn g | <...>::g | TypeImplItemCanonicalPath | +| anonymous.rs:18:5:20:5 | impl ...::Trait for OtherStruct { ... } | None | | +| anonymous.rs:19:9:19:22 | fn f | None | | +| anonymous.rs:22:5:24:5 | fn nested | None | | +| anonymous.rs:23:9:23:27 | struct OtherStruct | None | | +| anonymous.rs:26:5:31:5 | fn usage | None | | +| anonymous.rs:34:1:36:1 | fn other | ...::other | ModuleItemCanonicalPath | +| anonymous.rs:35:5:35:23 | struct OtherStruct | None | | +| lib.rs:1:1:1:14 | mod anonymous | test::anonymous | Namespace | +| lib.rs:2:1:2:12 | mod regular | test::regular | Namespace | +| lib.rs:3:1:3:10 | mod usage | test::usage | Namespace | +| regular.rs:1:1:2:18 | struct Struct | ...::Struct | ModuleItemCanonicalPath | +| regular.rs:4:1:6:1 | trait Trait | ...::Trait | ModuleItemCanonicalPath | +| regular.rs:5:5:5:16 | fn f | ...::f | TypeItemCanonicalPath | +| regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | | +| regular.rs:9:5:9:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:12:1:14:1 | impl Struct { ... } | None | | +| regular.rs:13:5:13:22 | fn g | <...>::g | TypeImplItemCanonicalPath | +| regular.rs:16:1:18:1 | trait TraitWithBlanketImpl | ...::TraitWithBlanketImpl | ModuleItemCanonicalPath | +| regular.rs:17:5:17:16 | fn h | ...::h | TypeItemCanonicalPath | +| regular.rs:20:1:22:1 | impl TraitWithBlanketImpl for T { ... } | None | | +| regular.rs:21:5:21:18 | fn h | <_ as ...>::h | TraitImplItemCanonicalPath | +| regular.rs:24:1:24:16 | fn free | ...::free | ModuleItemCanonicalPath | +| regular.rs:26:1:30:1 | enum MyEnum | ...::MyEnum | ModuleItemCanonicalPath | +| regular.rs:27:5:27:12 | Variant1 | ...::Variant1 | TypeItemCanonicalPath | +| regular.rs:28:5:28:19 | Variant2 | ...::Variant2 | TypeItemCanonicalPath | +| regular.rs:29:5:29:25 | Variant3 | ...::Variant3 | TypeItemCanonicalPath | +| regular.rs:32:1:34:1 | trait GenericTrait | ...::GenericTrait | ModuleItemCanonicalPath | +| regular.rs:33:5:33:35 | fn generic_method | ...::generic_method | TypeItemCanonicalPath | +| regular.rs:36:1:39:1 | struct GenericStruct | ...::GenericStruct | ModuleItemCanonicalPath | +| regular.rs:41:1:41:50 | struct GenericTupleStruct | ...::GenericTupleStruct | ModuleItemCanonicalPath | +| regular.rs:44:1:47:1 | enum GenericEnum | ...::GenericEnum | ModuleItemCanonicalPath | +| regular.rs:45:5:45:8 | T | ...::T | TypeItemCanonicalPath | +| regular.rs:46:5:46:8 | U | ...::U | TypeItemCanonicalPath | +| regular.rs:49:1:51:1 | impl GenericTrait::<...> for GenericStruct::<...> { ... } | None | | +| regular.rs:50:5:50:37 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:53:1:55:1 | impl GenericTrait::<...> for GenericStruct::<...> { ... } | None | | +| regular.rs:54:5:54:39 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:57:1:59:1 | impl GenericTrait::<...> for GenericTupleStruct::<...> { ... } | None | | +| regular.rs:58:5:58:37 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:61:1:63:1 | impl GenericTrait::<...> for GenericTupleStruct::<...> { ... } | None | | +| regular.rs:62:5:62:39 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:65:1:67:1 | impl GenericTrait::<...> for GenericEnum::<...> { ... } | None | | +| regular.rs:66:5:66:37 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:69:1:71:1 | impl GenericTrait::<...> for GenericEnum::<...> { ... } | None | | +| regular.rs:70:5:70:39 | fn generic_method | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| regular.rs:73:1:75:1 | impl Trait for ... { ... } | None | | +| regular.rs:74:5:74:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:77:1:79:1 | impl Trait for ... { ... } | None | | +| regular.rs:78:5:78:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:81:1:83:1 | impl Trait for ... { ... } | None | | +| regular.rs:82:5:82:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:85:1:87:1 | impl Trait for ... { ... } | None | | +| regular.rs:86:5:86:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:89:1:91:1 | impl Trait for ... { ... } | None | | +| regular.rs:90:5:90:18 | fn f | <... as ...>::f | TraitImplItemCanonicalPath | +| regular.rs:93:1:95:1 | trait TraitWithNew | ...::TraitWithNew | ModuleItemCanonicalPath | +| regular.rs:94:5:94:21 | fn new | ...::new | TypeItemCanonicalPath | +| regular.rs:97:1:101:1 | impl TraitWithNew for GenericStruct::<...> { ... } | None | | +| regular.rs:98:5:100:5 | fn new | <... as ...>::new | TraitImplItemCanonicalPath | +| usage.rs:1:1:1:22 | Use | None | | +| usage.rs:3:1:9:1 | fn usage | ...::usage | ModuleItemCanonicalPath | +| usage.rs:11:1:17:1 | fn enum_qualified_usage | ...::enum_qualified_usage | ModuleItemCanonicalPath | +| usage.rs:19:1:26:1 | fn enum_unqualified_usage | ...::enum_unqualified_usage | ModuleItemCanonicalPath | +| usage.rs:22:5:22:18 | Use | None | | +| usage.rs:28:1:34:1 | fn enum_match | ...::enum_match | ModuleItemCanonicalPath | +| usage.rs:36:1:49:1 | fn generic_usage | ...::generic_usage | ModuleItemCanonicalPath | +| usage.rs:51:1:57:1 | fn use_trait | ...::use_trait | ModuleItemCanonicalPath | +| usage.rs:54:5:54:17 | vec!... | None | | +| usage.rs:59:1:61:1 | fn use_trait_with_new | ...::use_trait_with_new | ModuleItemCanonicalPath | resolvedPaths -| anonymous.rs:27:17:27:30 | OtherStruct {...} | None | -| anonymous.rs:28:9:28:9 | s | None | -| anonymous.rs:28:9:28:13 | s.f(...) | None | -| anonymous.rs:29:9:29:9 | s | None | -| anonymous.rs:29:9:29:13 | s.g(...) | None | -| anonymous.rs:30:9:30:14 | nested | None | -| usage.rs:4:13:4:21 | Struct {...} | ...::Struct | -| usage.rs:5:5:5:5 | s | None | -| usage.rs:5:5:5:9 | s.f(...) | <... as ...>::f | -| usage.rs:6:5:6:5 | s | None | -| usage.rs:6:5:6:9 | s.g(...) | <...>::g | -| usage.rs:7:5:7:5 | s | None | -| usage.rs:7:5:7:9 | s.h(...) | <_ as ...>::h | -| usage.rs:8:5:8:8 | free | ...::free | -| usage.rs:12:9:12:26 | ...::None::<...> | ...::None | -| usage.rs:13:9:13:20 | ...::Some | ...::Some | -| usage.rs:14:9:14:24 | ...::Variant1 | ...::Variant1 | -| usage.rs:15:9:15:24 | ...::Variant2 | ...::Variant2 | -| usage.rs:16:9:16:33 | ...::Variant3 {...} | ...::Variant3 | -| usage.rs:20:9:20:18 | None::<...> | ...::None | -| usage.rs:21:9:21:12 | Some | ...::Some | -| usage.rs:23:9:23:16 | Variant1 | ...::Variant1 | -| usage.rs:24:9:24:16 | Variant2 | ...::Variant2 | -| usage.rs:25:9:25:25 | Variant3 {...} | ...::Variant3 | -| usage.rs:29:11:29:11 | e | None | -| usage.rs:30:9:30:24 | ...::Variant1 | ...::Variant1 | -| usage.rs:31:9:31:27 | ...::Variant2(...) | ...::Variant2 | -| usage.rs:32:9:32:31 | ...::Variant3 {...} | ...::Variant3 | -| usage.rs:37:13:37:41 | GenericStruct {...} | ...::GenericStruct | -| usage.rs:38:5:38:5 | x | None | -| usage.rs:38:5:38:26 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:39:13:39:47 | GenericStruct {...} | ...::GenericStruct | -| usage.rs:40:5:40:5 | x | None | -| usage.rs:40:5:40:23 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:41:13:41:30 | GenericTupleStruct | ...::GenericTupleStruct | -| usage.rs:42:5:42:5 | x | None | -| usage.rs:42:5:42:26 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:43:13:43:30 | GenericTupleStruct | ...::GenericTupleStruct | -| usage.rs:44:5:44:5 | x | None | -| usage.rs:44:5:44:23 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:45:13:45:37 | ...::T | ...::T | -| usage.rs:46:5:46:5 | x | None | -| usage.rs:46:5:46:27 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:47:13:47:37 | ...::U | ...::U | -| usage.rs:48:5:48:5 | x | None | -| usage.rs:48:5:48:23 | x.generic_method(...) | <... as ...>::generic_method | -| usage.rs:52:5:52:10 | ... .f(...) | <... as ...>::f | -| usage.rs:53:5:53:15 | ... .f(...) | <... as ...>::f | -| usage.rs:54:5:54:17 | ...::into_vec | None | -| usage.rs:54:5:54:17 | ...::new | None | -| usage.rs:54:5:54:28 | ... .as_slice(...) | <...>::as_slice | -| usage.rs:54:5:54:32 | ... .f(...) | <... as ...>::f | -| usage.rs:55:5:55:16 | ... .f(...) | <... as ...>::f | -| usage.rs:56:5:56:20 | ... .f(...) | <... as ...>::f | +| anonymous.rs:27:17:27:30 | OtherStruct {...} | None | | +| anonymous.rs:28:9:28:9 | s | None | | +| anonymous.rs:28:9:28:13 | s.f(...) | None | | +| anonymous.rs:29:9:29:9 | s | None | | +| anonymous.rs:29:9:29:13 | s.g(...) | None | | +| anonymous.rs:30:9:30:14 | nested | None | | +| regular.rs:99:9:99:67 | GenericStruct {...} | ...::GenericStruct | ModuleItemCanonicalPath | +| regular.rs:99:26:99:41 | ...::default | ...::default | TypeItemCanonicalPath | +| regular.rs:99:49:99:64 | ...::default | ...::default | TypeItemCanonicalPath | +| usage.rs:4:13:4:21 | Struct {...} | ...::Struct | ModuleItemCanonicalPath | +| usage.rs:5:5:5:5 | s | None | | +| usage.rs:5:5:5:9 | s.f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:6:5:6:5 | s | None | | +| usage.rs:6:5:6:9 | s.g(...) | <...>::g | TypeImplItemCanonicalPath | +| usage.rs:7:5:7:5 | s | None | | +| usage.rs:7:5:7:9 | s.h(...) | <_ as ...>::h | TraitImplItemCanonicalPath | +| usage.rs:8:5:8:8 | free | ...::free | ModuleItemCanonicalPath | +| usage.rs:12:9:12:26 | ...::None::<...> | ...::None | TypeItemCanonicalPath | +| usage.rs:13:9:13:20 | ...::Some | ...::Some | TypeItemCanonicalPath | +| usage.rs:14:9:14:24 | ...::Variant1 | ...::Variant1 | TypeItemCanonicalPath | +| usage.rs:15:9:15:24 | ...::Variant2 | ...::Variant2 | TypeItemCanonicalPath | +| usage.rs:16:9:16:33 | ...::Variant3 {...} | ...::Variant3 | TypeItemCanonicalPath | +| usage.rs:20:9:20:18 | None::<...> | ...::None | TypeItemCanonicalPath | +| usage.rs:21:9:21:12 | Some | ...::Some | TypeItemCanonicalPath | +| usage.rs:23:9:23:16 | Variant1 | ...::Variant1 | TypeItemCanonicalPath | +| usage.rs:24:9:24:16 | Variant2 | ...::Variant2 | TypeItemCanonicalPath | +| usage.rs:25:9:25:25 | Variant3 {...} | ...::Variant3 | TypeItemCanonicalPath | +| usage.rs:29:11:29:11 | e | None | | +| usage.rs:30:9:30:24 | ...::Variant1 | ...::Variant1 | TypeItemCanonicalPath | +| usage.rs:31:9:31:27 | ...::Variant2(...) | ...::Variant2 | TypeItemCanonicalPath | +| usage.rs:32:9:32:31 | ...::Variant3 {...} | ...::Variant3 | TypeItemCanonicalPath | +| usage.rs:37:13:37:41 | GenericStruct {...} | ...::GenericStruct | ModuleItemCanonicalPath | +| usage.rs:38:5:38:5 | x | None | | +| usage.rs:38:5:38:26 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:39:13:39:47 | GenericStruct {...} | ...::GenericStruct | ModuleItemCanonicalPath | +| usage.rs:40:5:40:5 | x | None | | +| usage.rs:40:5:40:23 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:41:13:41:30 | GenericTupleStruct | ...::GenericTupleStruct | ModuleItemCanonicalPath | +| usage.rs:42:5:42:5 | x | None | | +| usage.rs:42:5:42:26 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:43:13:43:30 | GenericTupleStruct | ...::GenericTupleStruct | ModuleItemCanonicalPath | +| usage.rs:44:5:44:5 | x | None | | +| usage.rs:44:5:44:23 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:45:13:45:37 | ...::T | ...::T | TypeItemCanonicalPath | +| usage.rs:46:5:46:5 | x | None | | +| usage.rs:46:5:46:27 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:47:13:47:37 | ...::U | ...::U | TypeItemCanonicalPath | +| usage.rs:48:5:48:5 | x | None | | +| usage.rs:48:5:48:23 | x.generic_method(...) | <... as ...>::generic_method | TraitImplItemCanonicalPath | +| usage.rs:52:5:52:10 | ... .f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:53:5:53:15 | ... .f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:54:5:54:17 | ...::into_vec | None | | +| usage.rs:54:5:54:17 | ...::new | None | | +| usage.rs:54:5:54:28 | ... .as_slice(...) | <...>::as_slice | TypeImplItemCanonicalPath | +| usage.rs:54:5:54:32 | ... .f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:55:5:55:16 | ... .f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:56:5:56:20 | ... .f(...) | <... as ...>::f | TraitImplItemCanonicalPath | +| usage.rs:60:43:60:60 | ...::new | <... as ...>::new | TraitImplItemCanonicalPath | standardPaths | anonymous.rs:3:1:32:1 | fn canonicals | test::anonymous::canonicals | | anonymous.rs:15:9:15:22 | fn g | test::regular::Struct::g | @@ -149,13 +158,17 @@ standardPaths | regular.rs:44:1:47:1 | enum GenericEnum | test::regular::GenericEnum | | regular.rs:45:5:45:8 | T | test::regular::GenericEnum::T | | regular.rs:46:5:46:8 | U | test::regular::GenericEnum::U | +| regular.rs:93:1:95:1 | trait TraitWithNew | test::regular::TraitWithNew | +| regular.rs:94:5:94:21 | fn new | test::regular::TraitWithNew::new | | usage.rs:3:1:9:1 | fn usage | test::usage::usage | | usage.rs:11:1:17:1 | fn enum_qualified_usage | test::usage::enum_qualified_usage | | usage.rs:19:1:26:1 | fn enum_unqualified_usage | test::usage::enum_unqualified_usage | | usage.rs:28:1:34:1 | fn enum_match | test::usage::enum_match | | usage.rs:36:1:49:1 | fn generic_usage | test::usage::generic_usage | | usage.rs:51:1:57:1 | fn use_trait | test::usage::use_trait | +| usage.rs:59:1:61:1 | fn use_trait_with_new | test::usage::use_trait_with_new | resolve +| regular.rs:99:9:99:67 | GenericStruct {...} | regular.rs:36:1:39:1 | struct GenericStruct | | usage.rs:4:13:4:21 | Struct {...} | regular.rs:1:1:2:18 | struct Struct | | usage.rs:5:5:5:9 | s.f(...) | regular.rs:9:5:9:18 | fn f | | usage.rs:6:5:6:9 | s.g(...) | anonymous.rs:15:9:15:22 | fn g | @@ -188,3 +201,4 @@ resolve | usage.rs:54:5:54:32 | ... .f(...) | regular.rs:82:5:82:18 | fn f | | usage.rs:55:5:55:16 | ... .f(...) | regular.rs:86:5:86:18 | fn f | | usage.rs:56:5:56:20 | ... .f(...) | regular.rs:90:5:90:18 | fn f | +| usage.rs:60:43:60:60 | ...::new | regular.rs:98:5:100:5 | fn new | diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql index b8cd62f4936..484dbedfaf4 100644 --- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql +++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql @@ -1,21 +1,25 @@ import rust import TestUtils -query predicate canonicalPaths(Addressable i, string answer) { +query predicate canonicalPaths(Addressable i, string answer, string cls) { toBeTested(i) and ( - answer = i.getCanonicalPath().toString() + exists(CanonicalPath p | + p = i.getCanonicalPath() and answer = p.toString() and cls = p.getPrimaryQlClasses() + ) or - not i.hasCanonicalPath() and answer = "None" + not i.hasCanonicalPath() and answer = "None" and cls = "" ) } -query predicate resolvedPaths(Resolvable i, string answer) { +query predicate resolvedPaths(Resolvable i, string answer, string cls) { toBeTested(i) and ( - answer = i.getResolvedCanonicalPath().toString() + exists(CanonicalPath p | + p = i.getResolvedCanonicalPath() and answer = p.toString() and cls = p.getPrimaryQlClasses() + ) or - not i.hasResolvedCanonicalPath() and answer = "None" + not i.hasResolvedCanonicalPath() and answer = "None" and cls = "" ) } diff --git a/rust/ql/test/extractor-tests/canonical_path/regular.rs b/rust/ql/test/extractor-tests/canonical_path/regular.rs index bdcf8b80cf3..25ee02ef9ab 100644 --- a/rust/ql/test/extractor-tests/canonical_path/regular.rs +++ b/rust/ql/test/extractor-tests/canonical_path/regular.rs @@ -89,3 +89,13 @@ impl Trait for [&str; 2] { impl Trait for [&str; 3] { fn f(&self) {} } + +pub trait TraitWithNew { + fn new() -> Self; +} + +impl TraitWithNew for GenericStruct { + fn new() -> Self { + GenericStruct{t: Default::default(), u: Default::default()} + } +} diff --git a/rust/ql/test/extractor-tests/canonical_path/usage.rs b/rust/ql/test/extractor-tests/canonical_path/usage.rs index 4dd6f278641..90bb95ede57 100644 --- a/rust/ql/test/extractor-tests/canonical_path/usage.rs +++ b/rust/ql/test/extractor-tests/canonical_path/usage.rs @@ -55,3 +55,7 @@ fn use_trait() { ["", ""].f(); ["", "", ""].f(); } + +fn use_trait_with_new() { + let x: GenericStruct = GenericStruct::new(); +} diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql index 75b59cdf3ea..9f2654cdf6f 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const.ql +++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasBody, string isConst, string isDefault, string hasName, - string hasTypeRepr, string hasVisibility + Const x, string hasCanonicalPath, int getNumberOfAttrs, string hasBody, string isConst, + string isDefault, string hasName, string hasTypeRepr, string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -23,7 +16,6 @@ where (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, - "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, - "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", + hasBody, "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName, "hasTypeRepr:", + hasTypeRepr, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql deleted file mode 100644 index 644b9240980..00000000000 --- a/rust/ql/test/extractor-tests/generated/Const/Const_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Const x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql deleted file mode 100644 index c11c4e0856d..00000000000 --- a/rust/ql/test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Const x -where toBeTested(x) and not x.isUnknown() -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 635af56257e..14daec3dc89 100644 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql +++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - Enum x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasVariantList, - string hasVisibility, string hasWhereClause + Enum x, string hasCanonicalPath, int getNumberOfAttrs, string hasGenericParamList, string hasName, + string hasVariantList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -22,7 +15,6 @@ 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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVariantList:", hasVariantList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql deleted file mode 100644 index 07fdc2fe5cd..00000000000 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Enum x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql deleted file mode 100644 index fa456ecd9d0..00000000000 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Enum x -where toBeTested(x) and not x.isUnknown() -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 a7a1403255d..da83b20973d 100644 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql +++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql @@ -3,22 +3,15 @@ import codeql.rust.elements import TestUtils from - ExternBlock x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - string hasAbi, int getNumberOfAttrs, string hasExternItemList, string isUnsafe + ExternBlock x, string hasCanonicalPath, string hasAbi, int getNumberOfAttrs, + string hasExternItemList, string isUnsafe where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no") and if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "hasAbi:", hasAbi, "getNumberOfAttrs:", getNumberOfAttrs, - "hasExternItemList:", hasExternItemList, "isUnsafe:", isUnsafe +select x, "hasCanonicalPath:", hasCanonicalPath, "hasAbi:", hasAbi, "getNumberOfAttrs:", + getNumberOfAttrs, "hasExternItemList:", hasExternItemList, "isUnsafe:", isUnsafe diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql deleted file mode 100644 index 5be455fe7d2..00000000000 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from ExternBlock x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql deleted file mode 100644 index f0bd607a179..00000000000 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from ExternBlock x -where toBeTested(x) and not x.isUnknown() -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 e200986480f..7217843c003 100644 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql +++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql @@ -3,22 +3,15 @@ import codeql.rust.elements import TestUtils from - ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasNameRef, string hasRename, string hasVisibility + ExternCrate x, string hasCanonicalPath, int getNumberOfAttrs, string hasNameRef, string hasRename, + string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", - hasNameRef, "hasRename:", hasRename, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, + "hasNameRef:", hasNameRef, "hasRename:", hasRename, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql deleted file mode 100644 index b6b74730fe4..00000000000 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from ExternCrate x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql deleted file mode 100644 index 15959426eed..00000000000 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from ExternCrate x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql index 3cf8f159c0f..f19d20684a1 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function.ql +++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql @@ -3,21 +3,15 @@ import codeql.rust.elements import TestUtils from - Function x, string hasParamList, int getNumberOfAttrs, string hasExtendedCanonicalPath, - string hasCrateOrigin, string hasCanonicalPath, string hasAbi, string hasBody, - string hasGenericParamList, string isAsync, string isConst, string isDefault, string isGen, - string isUnsafe, string hasName, string hasRetType, string hasVisibility, string hasWhereClause + Function x, string hasParamList, int getNumberOfAttrs, string hasCanonicalPath, string hasAbi, + string hasBody, string hasGenericParamList, string isAsync, string isConst, string isDefault, + string isGen, string isUnsafe, string hasName, string hasRetType, string hasVisibility, + string hasWhereClause where toBeTested(x) and not x.isUnknown() and (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -31,9 +25,8 @@ 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, - "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "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, "hasCanonicalPath:", + hasCanonicalPath, "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_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql deleted file mode 100644 index 933e5867d84..00000000000 --- a/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Function x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql deleted file mode 100644 index f2c413748de..00000000000 --- a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Function x -where toBeTested(x) and not x.isUnknown() -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 68914ddf58b..ed3cabc467a 100644 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql +++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql @@ -3,19 +3,12 @@ import codeql.rust.elements import TestUtils from - Impl x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isConst, - string isDefault, string isUnsafe, string hasSelfTy, string hasTrait, string hasVisibility, - string hasWhereClause + Impl x, string hasCanonicalPath, 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.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and @@ -27,8 +20,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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", - getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isConst:", isConst, "isDefault:", - isDefault, "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", hasTrait, - "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause +select x, "hasCanonicalPath:", hasCanonicalPath, "hasAssocItemList:", hasAssocItemList, + "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isConst:", + isConst, "isDefault:", isDefault, "isUnsafe:", isUnsafe, "hasSelfTy:", hasSelfTy, "hasTrait:", + hasTrait, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql deleted file mode 100644 index b9d428ce94a..00000000000 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Impl x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql deleted file mode 100644 index 140490fcaff..00000000000 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Impl x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql index 0f44d9c8224..8966bc866e3 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql @@ -3,22 +3,15 @@ import codeql.rust.elements import TestUtils from - MacroCall x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasPath, string hasTokenTree, string hasExpanded + MacroCall x, string hasCanonicalPath, int getNumberOfAttrs, string hasPath, string hasTokenTree, + string hasExpanded where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", hasPath, - "hasTokenTree:", hasTokenTree, "hasExpanded:", hasExpanded +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasPath:", + hasPath, "hasTokenTree:", hasTokenTree, "hasExpanded:", hasExpanded diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql deleted file mode 100644 index 60e32669e7f..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroCall x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql deleted file mode 100644 index 0fffb4f4384..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroCall x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql index d70f0d4a3d3..f5cc4fb3117 100644 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql +++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql @@ -3,23 +3,16 @@ import codeql.rust.elements import TestUtils from - MacroDef x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - string hasArgs, int getNumberOfAttrs, string hasBody, string hasName, string hasVisibility + MacroDef x, string hasCanonicalPath, string hasArgs, int getNumberOfAttrs, string hasBody, + string hasName, string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and (if x.hasArgs() then hasArgs = "yes" else hasArgs = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and (if x.hasName() then hasName = "yes" else hasName = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "hasArgs:", hasArgs, "getNumberOfAttrs:", getNumberOfAttrs, - "hasBody:", hasBody, "hasName:", hasName, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "hasArgs:", hasArgs, "getNumberOfAttrs:", + getNumberOfAttrs, "hasBody:", hasBody, "hasName:", hasName, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql deleted file mode 100644 index 81aa4aa3fad..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroDef x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql deleted file mode 100644 index c30de43e669..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroDef x -where toBeTested(x) and not x.isUnknown() -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 8645d8625f4..ee225a71038 100644 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql +++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql @@ -3,22 +3,15 @@ import codeql.rust.elements import TestUtils from - MacroRules x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasName, string hasTokenTree, string hasVisibility + MacroRules x, string hasCanonicalPath, int getNumberOfAttrs, string hasName, string hasTokenTree, + string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, - "hasTokenTree:", hasTokenTree, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", + hasName, "hasTokenTree:", hasTokenTree, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql deleted file mode 100644 index 987a91f5706..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroRules x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql deleted file mode 100644 index b2fa0cc9f7e..00000000000 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MacroRules x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql index 13382d08519..d3b5692c874 100644 --- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql +++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql @@ -3,20 +3,13 @@ import codeql.rust.elements import TestUtils from - MethodCallExpr x, string hasArgList, int getNumberOfAttrs, string hasResolvedPath, - string hasResolvedCrateOrigin, string hasResolvedCanonicalPath, string hasGenericArgList, - string hasNameRef, string hasReceiver + MethodCallExpr x, string hasArgList, int getNumberOfAttrs, string hasResolvedCanonicalPath, + string hasGenericArgList, string hasNameRef, string hasReceiver where toBeTested(x) and not x.isUnknown() and (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" @@ -25,7 +18,6 @@ where (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and if x.hasReceiver() then hasReceiver = "yes" else hasReceiver = "no" -select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasResolvedPath:", - hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, "hasResolvedCanonicalPath:", - hasResolvedCanonicalPath, "hasGenericArgList:", hasGenericArgList, "hasNameRef:", hasNameRef, - "hasReceiver:", hasReceiver +select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, + "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasGenericArgList:", hasGenericArgList, + "hasNameRef:", hasNameRef, "hasReceiver:", hasReceiver diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql deleted file mode 100644 index dfb29218133..00000000000 --- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MethodCallExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql deleted file mode 100644 index df94686cbf6..00000000000 --- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from MethodCallExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql index 73e68034023..52c9b581d30 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module.ql +++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql @@ -3,22 +3,15 @@ import codeql.rust.elements import TestUtils from - Module x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasItemList, string hasName, string hasVisibility + Module x, string hasCanonicalPath, int getNumberOfAttrs, string hasItemList, string hasName, + string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasItemList() then hasItemList = "yes" else hasItemList = "no") and (if x.hasName() then hasName = "yes" else hasName = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasItemList:", - hasItemList, "hasName:", hasName, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, + "hasItemList:", hasItemList, "hasName:", hasName, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql deleted file mode 100644 index 7a95cdcc772..00000000000 --- a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Module x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql deleted file mode 100644 index 9c810fe65c6..00000000000 --- a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Module x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql index 139606cef59..79c7a9aca16 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql @@ -2,18 +2,10 @@ import codeql.rust.elements import TestUtils -from - PathExpr x, string hasResolvedPath, string hasResolvedCrateOrigin, - string hasResolvedCanonicalPath, string hasPath, int getNumberOfAttrs +from PathExpr x, string hasResolvedCanonicalPath, string hasPath, int getNumberOfAttrs where toBeTested(x) and not x.isUnknown() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" @@ -21,6 +13,5 @@ where ) and (if x.hasPath() then hasPath = "yes" else hasPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() -select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, - "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, "getNumberOfAttrs:", - getNumberOfAttrs +select x, "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, + "getNumberOfAttrs:", getNumberOfAttrs diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedCrateOrigin.ql deleted file mode 100644 index 24e07918484..00000000000 --- a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from PathExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedPath.ql deleted file mode 100644 index 10e6ceb2a0b..00000000000 --- a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from PathExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql index 5338dd704d6..60a86860114 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql @@ -2,23 +2,14 @@ import codeql.rust.elements import TestUtils -from - PathPat x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasResolvedCanonicalPath, - string hasPath +from PathPat x, string hasResolvedCanonicalPath, string hasPath where toBeTested(x) and not x.isUnknown() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" else hasResolvedCanonicalPath = "no" ) and if x.hasPath() then hasPath = "yes" else hasPath = "no" -select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, - "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath +select x, "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql deleted file mode 100644 index 7ed41155d77..00000000000 --- a/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from PathPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql deleted file mode 100644 index cbe1932925a..00000000000 --- a/rust/ql/test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from PathPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql index 08d4222aa73..c13d7a922a0 100644 --- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql +++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql @@ -2,18 +2,10 @@ import codeql.rust.elements import TestUtils -from - RecordExpr x, string hasResolvedPath, string hasResolvedCrateOrigin, - string hasResolvedCanonicalPath, string hasPath, string hasRecordExprFieldList +from RecordExpr x, string hasResolvedCanonicalPath, string hasPath, string hasRecordExprFieldList where toBeTested(x) and not x.isUnknown() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" @@ -23,6 +15,5 @@ where if x.hasRecordExprFieldList() then hasRecordExprFieldList = "yes" else hasRecordExprFieldList = "no" -select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, - "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, +select x, "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, "hasRecordExprFieldList:", hasRecordExprFieldList diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql deleted file mode 100644 index 25635cb050f..00000000000 --- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from RecordExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql deleted file mode 100644 index 0f3230f3314..00000000000 --- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from RecordExpr x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql index f9d649b04d9..21083f33446 100644 --- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql +++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql @@ -2,18 +2,10 @@ import codeql.rust.elements import TestUtils -from - RecordPat x, string hasResolvedPath, string hasResolvedCrateOrigin, - string hasResolvedCanonicalPath, string hasPath, string hasRecordPatFieldList +from RecordPat x, string hasResolvedCanonicalPath, string hasPath, string hasRecordPatFieldList where toBeTested(x) and not x.isUnknown() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" @@ -21,6 +13,5 @@ where ) and (if x.hasPath() then hasPath = "yes" else hasPath = "no") and if x.hasRecordPatFieldList() then hasRecordPatFieldList = "yes" else hasRecordPatFieldList = "no" -select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, - "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, +select x, "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, "hasRecordPatFieldList:", hasRecordPatFieldList diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql deleted file mode 100644 index f80865d0515..00000000000 --- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from RecordPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql deleted file mode 100644 index a816942e47b..00000000000 --- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from RecordPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql index 72d647dcdba..c57b98ae77c 100644 --- a/rust/ql/test/extractor-tests/generated/Static/Static.ql +++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasBody, string isMut, string isStatic, string hasName, - string hasTypeRepr, string hasVisibility + Static x, string hasCanonicalPath, int getNumberOfAttrs, string hasBody, string isMut, + string isStatic, string hasName, string hasTypeRepr, string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasBody() then hasBody = "yes" else hasBody = "no") and @@ -23,7 +16,6 @@ where (if x.hasName() then hasName = "yes" else hasName = "no") and (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, - "isMut:", isMut, "isStatic:", isStatic, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", + hasBody, "isMut:", isMut, "isStatic:", isStatic, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql deleted file mode 100644 index 373b6bd45f4..00000000000 --- a/rust/ql/test/extractor-tests/generated/Static/Static_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Static x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql deleted file mode 100644 index 32b3a0c127e..00000000000 --- a/rust/ql/test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Static x -where toBeTested(x) and not x.isUnknown() -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 0146dead6eb..84bd193a7e0 100644 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql +++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - Struct x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasFieldList, string hasGenericParamList, string hasName, - string hasVisibility, string hasWhereClause + Struct x, string hasCanonicalPath, int getNumberOfAttrs, string hasFieldList, + string hasGenericParamList, string hasName, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and @@ -22,7 +15,6 @@ 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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasFieldList:", - hasFieldList, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasVisibility:", - hasVisibility, "hasWhereClause:", hasWhereClause +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, + "hasFieldList:", hasFieldList, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, + "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql deleted file mode 100644 index cafe120d4de..00000000000 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Struct x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql deleted file mode 100644 index f502a347b3e..00000000000 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Struct x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql index 8c1ee1ab07f..e2793868b07 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql @@ -3,19 +3,12 @@ import codeql.rust.elements import TestUtils from - Trait x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - string hasAssocItemList, int getNumberOfAttrs, string hasGenericParamList, string isAuto, - string isUnsafe, string hasName, string hasTypeBoundList, string hasVisibility, - string hasWhereClause + Trait x, string hasCanonicalPath, 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.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and @@ -26,8 +19,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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "hasAssocItemList:", hasAssocItemList, "getNumberOfAttrs:", - getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isAuto:", isAuto, "isUnsafe:", - isUnsafe, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", - hasVisibility, "hasWhereClause:", hasWhereClause +select x, "hasCanonicalPath:", hasCanonicalPath, "hasAssocItemList:", hasAssocItemList, + "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isAuto:", + isAuto, "isUnsafe:", isUnsafe, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, + "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql deleted file mode 100644 index 8c2c71a918e..00000000000 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Trait x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql deleted file mode 100644 index 5281a18656b..00000000000 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Trait x -where toBeTested(x) and not x.isUnknown() -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 631323a0ce8..882c63ddfdb 100644 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - TraitAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasTypeBoundList, - string hasVisibility, string hasWhereClause + TraitAlias x, string hasCanonicalPath, int getNumberOfAttrs, string hasGenericParamList, + string hasName, string hasTypeBoundList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -22,7 +15,6 @@ 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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql deleted file mode 100644 index 6f9ccf89262..00000000000 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TraitAlias x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql deleted file mode 100644 index 6326e730c33..00000000000 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TraitAlias x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql index d1f41111a13..daffdd786d6 100644 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql +++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql @@ -2,18 +2,10 @@ import codeql.rust.elements import TestUtils -from - TupleStructPat x, string hasResolvedPath, string hasResolvedCrateOrigin, - string hasResolvedCanonicalPath, string hasPath, int getNumberOfFields +from TupleStructPat x, string hasResolvedCanonicalPath, string hasPath, int getNumberOfFields where toBeTested(x) and not x.isUnknown() and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and ( if x.hasResolvedCanonicalPath() then hasResolvedCanonicalPath = "yes" @@ -21,6 +13,5 @@ where ) and (if x.hasPath() then hasPath = "yes" else hasPath = "no") and getNumberOfFields = x.getNumberOfFields() -select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, - "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, "getNumberOfFields:", - getNumberOfFields +select x, "hasResolvedCanonicalPath:", hasResolvedCanonicalPath, "hasPath:", hasPath, + "getNumberOfFields:", getNumberOfFields diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOrigin.ql deleted file mode 100644 index 144302946a9..00000000000 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TupleStructPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql deleted file mode 100644 index 561c303d968..00000000000 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getResolvedPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TupleStructPat x -where toBeTested(x) and not x.isUnknown() -select x, x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql index 841c0b608f6..79f84c73426 100644 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql @@ -3,18 +3,12 @@ import codeql.rust.elements import TestUtils from - TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasGenericParamList, string isDefault, string hasName, - string hasTypeRepr, string hasTypeBoundList, string hasVisibility, string hasWhereClause + TypeAlias x, string hasCanonicalPath, int getNumberOfAttrs, string hasGenericParamList, + string isDefault, string hasName, string hasTypeRepr, string hasTypeBoundList, + string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -24,8 +18,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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isDefault:", isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql deleted file mode 100644 index 9a4de0cd9b8..00000000000 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TypeAlias x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql deleted file mode 100644 index 1f99c759556..00000000000 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from TypeAlias x -where toBeTested(x) and not x.isUnknown() -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 a68af672822..1366f0e093c 100644 --- a/rust/ql/test/extractor-tests/generated/Union/Union.ql +++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql @@ -3,18 +3,11 @@ import codeql.rust.elements import TestUtils from - Union x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasGenericParamList, string hasName, string hasRecordFieldList, - string hasVisibility, string hasWhereClause + Union x, string hasCanonicalPath, int getNumberOfAttrs, string hasGenericParamList, + string hasName, string hasRecordFieldList, string hasVisibility, string hasWhereClause where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and @@ -22,7 +15,6 @@ 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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "hasName:", hasName, "hasRecordFieldList:", hasRecordFieldList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql deleted file mode 100644 index fdbd56d9e88..00000000000 --- a/rust/ql/test/extractor-tests/generated/Union/Union_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Union x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql deleted file mode 100644 index fb20efa8f29..00000000000 --- a/rust/ql/test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Union x -where toBeTested(x) and not x.isUnknown() -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 9969cab70c4..8fd8e7e704a 100644 --- a/rust/ql/test/extractor-tests/generated/Use/Use.ql +++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql @@ -2,22 +2,13 @@ import codeql.rust.elements import TestUtils -from - Use x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasUseTree, string hasVisibility +from Use x, string hasCanonicalPath, int getNumberOfAttrs, string hasUseTree, string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasUseTree() then hasUseTree = "yes" else hasUseTree = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasUseTree:", - hasUseTree, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, + "hasUseTree:", hasUseTree, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql deleted file mode 100644 index 8e90afcc335..00000000000 --- a/rust/ql/test/extractor-tests/generated/Use/Use_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Use x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql deleted file mode 100644 index 64c633c6c7d..00000000000 --- a/rust/ql/test/extractor-tests/generated/Use/Use_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Use x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql index 68b4bcac558..8917b039fb8 100644 --- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql +++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql @@ -3,23 +3,16 @@ import codeql.rust.elements import TestUtils from - Variant x, string hasExtendedCanonicalPath, string hasCrateOrigin, string hasCanonicalPath, - int getNumberOfAttrs, string hasExpr, string hasFieldList, string hasName, string hasVisibility + Variant x, string hasCanonicalPath, int getNumberOfAttrs, string hasExpr, string hasFieldList, + string hasName, string hasVisibility where toBeTested(x) and not x.isUnknown() and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and (if x.hasCanonicalPath() then hasCanonicalPath = "yes" else hasCanonicalPath = "no") and getNumberOfAttrs = x.getNumberOfAttrs() and (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and (if x.hasName() then hasName = "yes" else hasName = "no") and if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin, - "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, - "hasFieldList:", hasFieldList, "hasName:", hasName, "hasVisibility:", hasVisibility +select x, "hasCanonicalPath:", hasCanonicalPath, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", + hasExpr, "hasFieldList:", hasFieldList, "hasName:", hasName, "hasVisibility:", hasVisibility diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql deleted file mode 100644 index 0acfd9827fe..00000000000 --- a/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Variant x -where toBeTested(x) and not x.isUnknown() -select x, x.getCrateOrigin() diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql deleted file mode 100644 index ad8aaf86a5c..00000000000 --- a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql +++ /dev/null @@ -1,7 +0,0 @@ -// generated by codegen, do not edit -import codeql.rust.elements -import TestUtils - -from Variant x -where toBeTested(x) and not x.isUnknown() -select x, x.getExtendedCanonicalPath() diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected index 1ec24c96b48..22a80abdb44 100644 --- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected +++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected @@ -490,18 +490,6 @@ storeStep | main.rs:177:16:177:16 | 2 | Point.x | main.rs:176:16:179:9 | Point {...} | | main.rs:178:16:178:25 | source(...) | Point.y | main.rs:176:16:179:9 | Point {...} | | main.rs:180:12:180:12 | 4 | Point3D.z | main.rs:175:13:181:5 | Point3D {...} | -| main.rs:198:27:198:36 | source(...) | Some | main.rs:198:14:198:37 | ...::Some(...) | -| main.rs:199:27:199:27 | 2 | Some | main.rs:199:14:199:28 | ...::Some(...) | -| main.rs:211:19:211:28 | source(...) | Some | main.rs:211:14:211:29 | Some(...) | -| main.rs:212:19:212:19 | 2 | Some | main.rs:212:14:212:20 | Some(...) | -| main.rs:224:19:224:28 | source(...) | Some | main.rs:224:14:224:29 | Some(...) | -| main.rs:229:19:229:28 | source(...) | Some | main.rs:229:14:229:29 | Some(...) | -| main.rs:230:19:230:19 | 2 | Some | main.rs:230:14:230:20 | Some(...) | -| main.rs:234:10:234:10 | 0 | Some | main.rs:234:5:234:11 | Some(...) | -| main.rs:238:35:238:44 | source(...) | Ok | main.rs:238:32:238:45 | Ok(...) | -| main.rs:239:35:239:35 | 2 | Ok | main.rs:239:32:239:36 | Ok(...) | -| main.rs:240:36:240:45 | source(...) | Err | main.rs:240:32:240:46 | Err(...) | -| main.rs:247:8:247:8 | 0 | Ok | main.rs:247:5:247:9 | Ok(...) | | main.rs:256:29:256:38 | source(...) | A | main.rs:256:14:256:39 | ...::A(...) | | main.rs:257:29:257:29 | 2 | B | main.rs:257:14:257:30 | ...::B(...) | | main.rs:274:16:274:25 | source(...) | A | main.rs:274:14:274:26 | A(...) | @@ -530,11 +518,12 @@ storeStep | main.rs:373:27:373:27 | 2 | array[] | main.rs:373:23:373:31 | [...] | | main.rs:373:30:373:30 | 3 | array[] | main.rs:373:23:373:31 | [...] | | main.rs:376:18:376:27 | source(...) | array[] | main.rs:376:5:376:11 | [post] mut_arr | +<<<<<<< Updated upstream | main.rs:406:35:406:61 | default_name | captured default_name | main.rs:406:35:406:61 | \|...\| ... | | main.rs:417:27:417:27 | 0 | Some | main.rs:417:22:417:28 | Some(...) | +======= +>>>>>>> Stashed changes readStep -| file://:0:0:0:0 | [summary param] self in lang:core::_::::unwrap | Some | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::option::Option::Some(0)] in lang:core::_::::unwrap | -| main.rs:33:9:33:15 | Some(...) | Some | main.rs:33:14:33:14 | _ | | main.rs:95:10:95:10 | a | tuple.0 | main.rs:95:10:95:12 | a.0 | | main.rs:96:10:96:10 | a | tuple.1 | main.rs:96:10:96:12 | a.1 | | main.rs:109:10:109:10 | a | tuple.0 | main.rs:109:10:109:12 | a.0 | @@ -551,10 +540,6 @@ readStep | main.rs:151:9:151:28 | Point {...} | Point.x | main.rs:151:20:151:20 | a | | main.rs:151:9:151:28 | Point {...} | Point.y | main.rs:151:26:151:26 | b | | main.rs:183:9:186:9 | Point3D {...} | Point3D.plane | main.rs:184:20:184:33 | Point {...} | -| main.rs:201:9:201:23 | ...::Some(...) | Some | main.rs:201:22:201:22 | n | -| main.rs:205:9:205:23 | ...::Some(...) | Some | main.rs:205:22:205:22 | n | -| main.rs:214:9:214:15 | Some(...) | Some | main.rs:214:14:214:14 | n | -| main.rs:218:9:218:15 | Some(...) | Some | main.rs:218:14:218:14 | n | | main.rs:231:14:231:15 | s1 | Ok | main.rs:231:14:231:16 | TryExpr | | main.rs:231:14:231:15 | s1 | Some | main.rs:231:14:231:16 | TryExpr | | main.rs:233:10:233:11 | s2 | Ok | main.rs:233:10:233:12 | TryExpr | diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected index 185bea1394f..824e3350f2a 100644 --- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected +++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected @@ -26,6 +26,7 @@ edges | main.rs:148:12:148:21 | source(...) | main.rs:147:13:150:5 | Point {...} [Point.x] | provenance | | | main.rs:151:9:151:28 | Point {...} [Point.x] | main.rs:151:20:151:20 | a | provenance | | | main.rs:151:20:151:20 | a | main.rs:152:10:152:10 | a | provenance | | +<<<<<<< Updated upstream | main.rs:198:14:198:37 | ...::Some(...) [Some] | main.rs:201:9:201:23 | ...::Some(...) [Some] | provenance | | | main.rs:198:27:198:36 | source(...) | main.rs:198:14:198:37 | ...::Some(...) [Some] | provenance | | | main.rs:201:9:201:23 | ...::Some(...) [Some] | main.rs:201:22:201:22 | n | provenance | | @@ -45,6 +46,8 @@ edges | main.rs:238:35:238:44 | source(...) | main.rs:238:32:238:45 | Ok(...) [Ok] | provenance | | | main.rs:241:14:241:15 | s1 [Ok] | main.rs:241:14:241:16 | TryExpr | provenance | | | main.rs:241:14:241:16 | TryExpr | main.rs:243:10:243:11 | i1 | provenance | | +======= +>>>>>>> Stashed changes | main.rs:256:14:256:39 | ...::A(...) [A] | main.rs:259:9:259:25 | ...::A(...) [A] | provenance | | | main.rs:256:14:256:39 | ...::A(...) [A] | main.rs:263:9:263:25 | ...::A(...) [A] | provenance | | | main.rs:256:29:256:38 | source(...) | main.rs:256:14:256:39 | ...::A(...) [A] | provenance | | @@ -136,6 +139,7 @@ nodes | main.rs:151:9:151:28 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] | | main.rs:151:20:151:20 | a | semmle.label | a | | main.rs:152:10:152:10 | a | semmle.label | a | +<<<<<<< Updated upstream | main.rs:198:14:198:37 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] | | main.rs:198:27:198:36 | source(...) | semmle.label | source(...) | | main.rs:201:9:201:23 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] | @@ -160,6 +164,8 @@ nodes | main.rs:241:14:241:15 | s1 [Ok] | semmle.label | s1 [Ok] | | main.rs:241:14:241:16 | TryExpr | semmle.label | TryExpr | | main.rs:243:10:243:11 | i1 | semmle.label | i1 | +======= +>>>>>>> Stashed changes | main.rs:256:14:256:39 | ...::A(...) [A] | semmle.label | ...::A(...) [A] | | main.rs:256:29:256:38 | source(...) | semmle.label | source(...) | | main.rs:259:9:259:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] | @@ -225,6 +231,11 @@ nodes | main.rs:379:10:379:19 | mut_arr[0] | semmle.label | mut_arr[0] | subpaths testFailures +| main.rs:201:37:201:56 | //... | Missing result: hasValueFlow=13 | +| main.rs:214:29:214:48 | //... | Missing result: hasValueFlow=14 | +| main.rs:225:24:225:43 | //... | Missing result: hasValueFlow=19 | +| main.rs:232:15:232:34 | //... | Missing result: hasValueFlow=20 | +| main.rs:243:15:243:34 | //... | Missing result: hasValueFlow=20 | #select | main.rs:15:10:15:18 | source(...) | main.rs:15:10:15:18 | source(...) | main.rs:15:10:15:18 | source(...) | $@ | main.rs:15:10:15:18 | source(...) | source(...) | | main.rs:20:10:20:10 | s | main.rs:19:13:19:21 | source(...) | main.rs:20:10:20:10 | s | $@ | main.rs:19:13:19:21 | source(...) | source(...) | @@ -237,11 +248,14 @@ testFailures | main.rs:113:10:113:12 | a.0 | main.rs:111:11:111:20 | source(...) | main.rs:113:10:113:12 | a.0 | $@ | main.rs:111:11:111:20 | source(...) | source(...) | | main.rs:121:10:121:15 | ... .1 | main.rs:118:17:118:26 | source(...) | main.rs:121:10:121:15 | ... .1 | $@ | main.rs:118:17:118:26 | source(...) | source(...) | | main.rs:152:10:152:10 | a | main.rs:148:12:148:21 | source(...) | main.rs:152:10:152:10 | a | $@ | main.rs:148:12:148:21 | source(...) | source(...) | +<<<<<<< Updated upstream | main.rs:201:33:201:33 | n | main.rs:198:27:198:36 | source(...) | main.rs:201:33:201:33 | n | $@ | main.rs:198:27:198:36 | source(...) | source(...) | | main.rs:214:25:214:25 | n | main.rs:211:19:211:28 | source(...) | main.rs:214:25:214:25 | n | $@ | main.rs:211:19:211:28 | source(...) | source(...) | | main.rs:225:10:225:20 | s1.unwrap(...) | main.rs:224:19:224:28 | source(...) | main.rs:225:10:225:20 | s1.unwrap(...) | $@ | main.rs:224:19:224:28 | source(...) | source(...) | | main.rs:232:10:232:11 | i1 | main.rs:229:19:229:28 | source(...) | main.rs:232:10:232:11 | i1 | $@ | main.rs:229:19:229:28 | source(...) | source(...) | | main.rs:243:10:243:11 | i1 | main.rs:238:35:238:44 | source(...) | main.rs:243:10:243:11 | i1 | $@ | main.rs:238:35:238:44 | source(...) | source(...) | +======= +>>>>>>> Stashed changes | main.rs:259:35:259:35 | n | main.rs:256:29:256:38 | source(...) | main.rs:259:35:259:35 | n | $@ | main.rs:256:29:256:38 | source(...) | source(...) | | main.rs:263:55:263:55 | n | main.rs:256:29:256:38 | source(...) | main.rs:263:55:263:55 | n | $@ | main.rs:256:29:256:38 | source(...) | source(...) | | main.rs:277:22:277:22 | n | main.rs:274:16:274:25 | source(...) | main.rs:277:22:277:22 | n | $@ | main.rs:274:16:274:25 | source(...) | source(...) | diff --git a/rust/ql/test/library-tests/dataflow/models/models.expected b/rust/ql/test/library-tests/dataflow/models/models.expected index 8c5ce17f8c8..b008183cf3f 100644 --- a/rust/ql/test/library-tests/dataflow/models/models.expected +++ b/rust/ql/test/library-tests/dataflow/models/models.expected @@ -10,6 +10,7 @@ models | 9 | Summary: repo::test; crate::set_var_field; Argument[0]; ReturnValue.Variant[crate::MyFieldEnum::D::field_d]; value | | 10 | Summary: repo::test; crate::set_var_pos; Argument[0]; ReturnValue.Variant[crate::MyPosEnum::B(0)]; value | edges +<<<<<<< Updated upstream | main.rs:15:13:15:21 | source(...) | main.rs:16:19:16:19 | s | provenance | | | main.rs:15:13:15:21 | source(...) | main.rs:16:19:16:19 | s | provenance | | | main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance | QL | @@ -192,10 +193,25 @@ nodes | main.rs:175:10:175:10 | t [tuple.1] | semmle.label | t [tuple.1] | | main.rs:175:10:175:12 | t.1 | semmle.label | t.1 | | main.rs:175:10:175:12 | t.1 | semmle.label | t.1 | +======= +nodes +>>>>>>> Stashed changes subpaths testFailures +| main.rs:16:24:16:42 | //... | Missing result: hasValueFlow=1 | +| main.rs:26:22:26:41 | //... | Missing result: hasTaintFlow=14 | +| main.rs:42:28:42:46 | //... | Missing result: hasValueFlow=2 | +| main.rs:57:37:57:55 | //... | Missing result: hasValueFlow=3 | +| main.rs:74:30:74:48 | //... | Missing result: hasValueFlow=4 | +| main.rs:89:51:89:69 | //... | Missing result: hasValueFlow=5 | invalidSpecComponent +| lang:core::_::::unwrap | Argument[self].Variant[crate::option::Option::Some(0)] | Variant[crate::option::Option::Some(0)] | +| repo::test::_::crate::get_var_field | Argument[0].Variant[crate::MyFieldEnum::C::field_c] | Variant[crate::MyFieldEnum::C::field_c] | +| repo::test::_::crate::get_var_pos | Argument[0].Variant[crate::MyPosEnum::A(0)] | Variant[crate::MyPosEnum::A(0)] | +| repo::test::_::crate::set_var_field | ReturnValue.Variant[crate::MyFieldEnum::D::field_d] | Variant[crate::MyFieldEnum::D::field_d] | +| repo::test::_::crate::set_var_pos | ReturnValue.Variant[crate::MyPosEnum::B(0)] | Variant[crate::MyPosEnum::B(0)] | #select +<<<<<<< Updated upstream | main.rs:16:10:16:20 | identity(...) | main.rs:15:13:15:21 | source(...) | main.rs:16:10:16:20 | identity(...) | $@ | main.rs:15:13:15:21 | source(...) | source(...) | | main.rs:16:10:16:20 | identity(...) | main.rs:15:13:15:21 | source(...) | main.rs:16:10:16:20 | identity(...) | $@ | main.rs:15:13:15:21 | source(...) | source(...) | | main.rs:26:10:26:18 | coerce(...) | main.rs:25:13:25:22 | source(...) | main.rs:26:10:26:18 | coerce(...) | $@ | main.rs:25:13:25:22 | source(...) | source(...) | @@ -217,3 +233,5 @@ invalidSpecComponent | main.rs:161:10:161:29 | get_tuple_element(...) | main.rs:159:13:159:22 | source(...) | main.rs:161:10:161:29 | get_tuple_element(...) | $@ | main.rs:159:13:159:22 | source(...) | source(...) | | main.rs:175:10:175:12 | t.1 | main.rs:172:13:172:22 | source(...) | main.rs:175:10:175:12 | t.1 | $@ | main.rs:172:13:172:22 | source(...) | source(...) | | main.rs:175:10:175:12 | t.1 | main.rs:172:13:172:22 | source(...) | main.rs:175:10:175:12 | t.1 | $@ | main.rs:172:13:172:22 | source(...) | source(...) | +======= +>>>>>>> Stashed changes diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql index 92a41dc4681..6f19d55bb41 100644 --- a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql +++ b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql @@ -10,7 +10,7 @@ module MyFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof ThreatModelSource } predicate isSink(DataFlow::Node sink) { - any(CallExpr call | call.getFunction().(PathExpr).getResolvedPath() = "crate::test::sink") + any(CallExpr call | call.getFunction().(PathExpr).resolvesToStandardPath("test::test", "sink")) .getArgList() .getAnArg() = sink.asExpr().getExpr() } diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected index f1395ff39ec..8bd6e31abc5 100644 --- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected +++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected @@ -1,21 +1,23 @@ -| test_cipher.rs:20:27:20:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:20:27:20:48 | ...::new(...) | The cryptographic algorithm RC4 | -| test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | The cryptographic algorithm RC4 | -| test_cipher.rs:26:27:26:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:26:27:26:48 | ...::new(...) | The cryptographic algorithm RC4 | -| test_cipher.rs:29:27:29:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:29:27:29:48 | ...::new(...) | The cryptographic algorithm RC4 | +#select | test_cipher.rs:59:23:59:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:59:23:59:42 | ...::new(...) | The cryptographic algorithm DES | | test_cipher.rs:63:23:63:47 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:63:23:63:47 | ...::new(...) | The cryptographic algorithm DES | -| test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | The cryptographic algorithm DES | | test_cipher.rs:71:23:71:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:71:23:71:42 | ...::new(...) | The cryptographic algorithm DES | | test_cipher.rs:75:27:75:46 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:75:27:75:46 | ...::new(...) | The cryptographic algorithm DES | | test_cipher.rs:80:24:80:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:80:24:80:48 | ...::new(...) | The cryptographic algorithm 3DES | | test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm 3DES | | test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm 3DES | -| test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | The cryptographic algorithm 3DES | | test_cipher.rs:97:23:97:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:97:23:97:42 | ...::new(...) | The cryptographic algorithm RC2 | | test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | The cryptographic algorithm RC2 | -| test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | The cryptographic algorithm RC2 | -| test_cipher.rs:110:23:110:50 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:110:23:110:50 | ...::new(...) | The cryptographic algorithm RC5 | -| test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | The cryptographic algorithm RC5 | -| test_cipher.rs:132:23:132:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:132:23:132:76 | ...::new(...) | The cryptographic algorithm DES | -| test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | The cryptographic algorithm DES | -| test_cipher.rs:141:23:141:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:141:23:141:76 | ...::new(...) | The cryptographic algorithm DES | +testFailures +| test_cipher.rs:20:51:20:95 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:23:72:23:116 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:26:51:26:95 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:29:51:29:95 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:67:64:67:108 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:92:64:92:108 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:105:59:105:103 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:110:53:110:97 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:114:67:114:111 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:132:79:132:123 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:138:88:138:132 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | +| test_cipher.rs:141:79:141:123 | //... | Missing result: Alert[rust/weak-cryptographic-algorithm] | diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py index 53e8092c5a2..ab37500a12a 100644 --- a/rust/schema/prelude.py +++ b/rust/schema/prelude.py @@ -80,20 +80,12 @@ class Addressable(AstNode): TODO: This does not yet include all possible cases. """ - 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 canonical_path: optional["CanonicalPath"] | rust.detach | ql.internal class Resolvable(AstNode): """ One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`. """ - resolved_path: optional[string] | rust.detach | ql.internal - resolved_crate_origin: optional[string] | rust.detach | ql.internal resolved_canonical_path: optional["CanonicalPath"] | rust.detach | ql.internal class PathAstNode(Resolvable): @@ -127,27 +119,27 @@ class Namespace(CanonicalPath): """ A namespace, comprised of a crate root and a possibly empty `::` separated module path. """ - root: "CrateRoot" + root: "CrateRef" | child path: string -class CrateRoot(CanonicalPathElement): +class CrateRef(CanonicalPathElement): """ The base class for all crate references. """ -class LangCrateRoot(CrateRoot): +class LangCrateRef(CrateRef): """ A reference to a crate in the Rust standard libraries. """ name: string -class RustcCrateRoot(CrateRoot): +class RustcCrateRef(CrateRef): """ A reference to a crate provided by rustc. TODO: understand where these come from. """ name: string -class RepoCrateRoot(CrateRoot): +class RepoCrateRef(CrateRef): """ A reference to a crate in the repository. """ @@ -165,7 +157,7 @@ class TypeGenericTypeArg(TypeGenericArg): """ A generic argument for a type that is a type. """ - path: "TypeCanonicalPath" + path: "TypeCanonicalPath" | child class ConstGenericTypeArg(TypeGenericArg): @@ -185,7 +177,7 @@ class ConcreteTypeCanonicalPath(TypeCanonicalPath): """ A canonical path for an actual type. """ - path: "ParametrizedCanonicalPath" + path: "ParametrizedCanonicalPath" | child class PlaceholderTypeCanonicalPath(TypeCanonicalPath): """ @@ -203,37 +195,37 @@ class DerivedTypeCanonicalPath(TypeCanonicalPath): A derived canonical type, like `[i32; 4]`, `&mut std::string::String` or `(i32, std::string::String)`. """ modifiers: list[string] - base: list[TypeCanonicalPath] + base: list[TypeCanonicalPath] | child class ModuleItemCanonicalPath(CanonicalPath): """ A canonical path for an item defined in a module. """ - namespace: Namespace + namespace: Namespace | child name: string class ParametrizedCanonicalPath(CanonicalPath): - base: ModuleItemCanonicalPath - generic_args: list[TypeGenericArg] + base: ModuleItemCanonicalPath | child + generic_args: list[TypeGenericArg] | child class TypeItemCanonicalPath(CanonicalPath): """ A canonical path for an item defined in a type or trait. """ - parent: ModuleItemCanonicalPath + parent: ModuleItemCanonicalPath | child name: string class TraitImplItemCanonicalPath(CanonicalPath): """ A canonical path for an item defined in a trait impl. """ - type_path: TypeCanonicalPath - trait_path: ParametrizedCanonicalPath + type_path: TypeCanonicalPath | child + trait_path: ParametrizedCanonicalPath | child name: string class TypeImplItemCanonicalPath(CanonicalPath): """ A canonical path for an item defined in a type impl. """ - parent: ModuleItemCanonicalPath + parent: ModuleItemCanonicalPath | child name: string