Rust: fix QL code after removing Crate::getModule()

Author: aibaars

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

@@ -60,13 +60,11 @@ module Impl {
     Crate getADependency() { result = this.getDependency(_) }
 
     /** Gets the source file that defines this crate, if any. */
-    SourceFile getSourceFile() { result.getFile() = this.getModule().getFile() }
+    SourceFile getSourceFile() { result.getFile() = this.getLocation().getFile() }
 
     /**
      * Gets a source file that belongs to this crate, if any.
      */
     SourceFile getASourceFile() { result = this.(CrateItemNode).getASourceFile() }
-
-    override Location getLocation() { result = this.getModule().getLocation() }
   }
 }

rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll

@@ -32,7 +32,7 @@ class OptionEnum extends Enum {
     // todo: replace with canonical path, once calculated in QL
     exists(Crate core, Module m |
       core.getName() = "core" and
-      m = core.getModule().getItemList().getAnItem() and
+      m = core.getSourceFile().getAnItem() and
       m.getName().getText() = "option" and
       this = m.getItemList().getAnItem() and
       this.getName().getText() = "Option"
@@ -53,7 +53,7 @@ class ResultEnum extends Enum {
     // todo: replace with canonical path, once calculated in QL
     exists(Crate core, Module m |
       core.getName() = "core" and
-      m = core.getModule().getItemList().getAnItem() and
+      m = core.getSourceFile().getAnItem() and
       m.getName().getText() = "result" and
       this = m.getItemList().getAnItem() and
       this.getName().getText() = "Result"

rust/ql/lib/codeql/rust/internal/AstConsistency.qll

@@ -24,10 +24,7 @@ query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) >
 /**
  * Holds if `e` does not have a `Location`.
  */
-query predicate noLocation(Locatable e) {
-  not exists(e.getLocation()) and
-  not e.(AstNode).getParentNode*() = any(Crate c).getModule()
-}
+query predicate noLocation(Locatable e) { not exists(e.getLocation()) }
 
 private predicate multiplePrimaryQlClasses(Element e) {
   strictcount(string cls | cls = e.getAPrimaryQlClass() and cls != "VariableAccess") > 1

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -245,11 +245,7 @@ abstract private class ModuleLikeNode extends ItemNode {
    * Holds if this is a root module, meaning either a source file or
    * the entry module of a crate.
    */
-  predicate isRoot() {
-    this instanceof SourceFileItemNode
-    or
-    this = any(Crate c).getModule()
-  }
+  predicate isRoot() { this instanceof SourceFileItemNode }
 }
 
 private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
@@ -277,12 +273,7 @@ class CrateItemNode extends ItemNode instanceof Crate {
    * or a module, when the crate is defined in a dependency.
    */
   pragma[nomagic]
-  ModuleLikeNode getModuleNode() {
-    result = super.getSourceFile()
-    or
-    not exists(super.getSourceFile()) and
-    result = super.getModule()
-  }
+  ModuleLikeNode getModuleNode() { result = super.getSourceFile() }
 
   /**
    * Gets a source file that belongs to this crate, if any.
@@ -306,11 +297,7 @@ class CrateItemNode extends ItemNode instanceof Crate {
   /**
    * Gets a root module node belonging to this crate.
    */
-  ModuleLikeNode getARootModuleNode() {
-    result = this.getASourceFile()
-    or
-    result = super.getModule()
-  }
+  ModuleLikeNode getARootModuleNode() { result = this.getASourceFile() }
 
   pragma[nomagic]
   predicate isPotentialDollarCrateTarget() {
@@ -829,7 +816,7 @@ private predicate crateDependencyEdge(ModuleLikeNode m, string name, CrateItemNo
   or
   // paths inside the crate graph use the name of the crate itself as prefix,
   // although that is not valid in Rust
-  dep = any(Crate c | name = c.getName() and m = c.getModule())
+  dep = any(Crate c | name = c.getName() and m = c.getSourceFile())
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {
@@ -1173,10 +1160,10 @@ private predicate useImportEdge(Use use, string name, ItemNode item) {
  * [1]: https://doc.rust-lang.org/core/prelude/index.html
  */
 private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
-  exists(Crate core, ModuleItemNode mod, ModuleItemNode prelude, ModuleItemNode rust |
+  exists(Crate core, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
     f = any(Crate c0 | core = c0.getDependency(_)).getASourceFile() and
     core.getName() = "core" and
-    mod = core.getModule() and
+    mod = core.getSourceFile() and
     prelude = mod.getASuccessorRec("prelude") and
     rust = prelude.getASuccessorRec(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
     i = rust.getASuccessorRec(name) and

rust/ql/test/TestUtils.qll

@@ -6,7 +6,7 @@ class CrateElement extends Element {
   CrateElement() {
     this instanceof Crate or
     this instanceof NamedCrate or
-    any(Crate c).getModule() = this.(AstNode).getParentNode*()
+    any(Crate c).getSourceFile() = this.(AstNode).getParentNode*()
   }
 }