Rust: Minor cleanup

Author: hvitved

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

@@ -11,6 +11,8 @@ private import codeql.rust.elements.internal.generated.Meta
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A meta item in an attribute.
@@ -26,5 +28,15 @@ module Impl {
    * }
    * ```
    */
-  class Meta extends Generated::Meta { }
+  class Meta extends Generated::Meta {
+    /** Gets the path, if it exists. */
+    pragma[nomagic]
+    Path getMetaPath() {
+      result = this.(PathMeta).getPath()
+      or
+      result = this.(KeyValueMeta).getPath()
+      or
+      result = this.(TokenTreeMeta).getPath()
+    }
+  }
 }

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

@@ -49,20 +49,6 @@ private import codeql.rust.internal.CachedStages
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 private import codeql.util.Option
 
-/** Gets the path of a `Meta` node, regardless of its concrete subtype. */
-pragma[nomagic]
-private Path getMetaPath(Meta m) {
-  result = m.(PathMeta).getPath()
-  or
-  result = m.(KeyValueMeta).getPath()
-  or
-  result = m.(TokenTreeMeta).getPath()
-}
-
-/** Gets the expression of a `Meta` node, regardless of its concrete subtype. */
-pragma[nomagic]
-private Expr getMetaExpr(Meta m) { result = m.(KeyValueMeta).getExpr() }
-
 private newtype TNamespace =
   TTypeNamespace() or
   TValueNamespace() or
@@ -277,7 +263,7 @@ abstract class ItemNode extends Locatable {
   pragma[nomagic]
   final Attr getAttr(string name) {
     result = this.getAnAttr() and
-    getMetaPath(result.getMeta()).(PathExt).isUnqualified(name)
+    result.getMeta().getMetaPath().(PathExt).isUnqualified(name)
   }
 
   final predicate hasAttr(string name) { exists(this.getAttr(name)) }
@@ -1394,7 +1380,7 @@ private predicate fileModuleInlineLate(SourceFile f, string name, Folder folder)
  */
 private Meta getPathAttrMeta(Module m) {
   result = m.getAnAttr().getMeta() and
-  getMetaPath(result).getText() = "path"
+  result.getMetaPath().getText() = "path"
 }
 
 /**
@@ -1455,10 +1441,10 @@ private predicate modImportNestedLookup(Module m, ModuleItemNode ancestor, Folde
 }
 
 private predicate pathAttrImport(Folder f, Module m, string relativePath) {
-  exists(Meta meta |
+  exists(KeyValueMeta meta |
     f = m.getFile().getParentContainer() and
     meta = getPathAttrMeta(m) and
-    relativePath = getMetaExpr(meta).(LiteralExpr).getTextValue().regexpCapture("\"(.+)\"", 1)
+    relativePath = meta.getExpr().(LiteralExpr).getTextValue().regexpCapture("\"(.+)\"", 1)
   )
 }
 
@@ -1839,7 +1825,7 @@ private module DollarCrateResolution {
     or
     exists(ItemNode type |
       expansion = type.(TypeItem).getDeriveMacroExpansion(_) and
-      macroDefPath = getMetaPath(type.getAttr("derive").getMeta())
+      macroDefPath = type.getAttr("derive").getMeta().getMetaPath()
     )
   }
 
@@ -1998,7 +1984,7 @@ private predicate pathUsesNamespace(PathExt p, Namespace n) {
   (
     p = any(MacroCall mc).getPath()
     or
-    p = getMetaPath(any(Meta m))
+    p = any(Meta m).getMetaPath()
   )
 }
 

rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql

@@ -12,17 +12,6 @@
  */
 
 import rust
-private import codeql.rust.elements.PathMeta
-private import codeql.rust.elements.KeyValueMeta
-private import codeql.rust.elements.TokenTreeMeta
-
-private Path getMetaPath(Meta m) {
-  result = m.(PathMeta).getPath()
-  or
-  result = m.(KeyValueMeta).getPath()
-  or
-  result = m.(TokenTreeMeta).getPath()
-}
 
 /**
  * A `#[ctor]` or `#[dtor]` attribute, that is, a source for this query.
@@ -31,7 +20,7 @@ class CtorAttr extends Attr {
   string whichAttr;
 
   CtorAttr() {
-    whichAttr = getMetaPath(this.getMeta()).getText() and
+    whichAttr = this.getMeta().getMetaPath().getText() and
     whichAttr = ["ctor", "dtor"]
   }