Rust: Exclude macro call paths from resolvePath

Author: hvitved

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

@@ -831,7 +831,8 @@ ItemNode resolvePath(RelevantPath path) {
   exists(Namespace ns | result = resolvePath0(path, ns) |
     pathUsesNamespace(path, ns)
     or
-    not pathUsesNamespace(path, _)
+    not pathUsesNamespace(path, _) and
+    not path = any(MacroCall mc).getPath()
   )
 }
 

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

@@ -7,6 +7,7 @@ private import PathResolution
 
 /** Holds if `p` may resolve to multiple items including `i`. */
 query predicate multiplePathResolutions(Path p, ItemNode i) {
+  p.fromSource() and
   i = resolvePath(p) and
   // `use foo::bar` may use both a type `bar` and a value `bar`
   not p =