wip

Author: hvitved

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

@@ -1350,7 +1350,10 @@ private predicate pathUsesNamespace(Path p, Namespace n) {
 /** Gets the item that `path` resolves to, if any. */
 cached
 ItemNode resolvePath(RelevantPath path) {
-  exists(Namespace ns | result = resolvePath0(path, ns, _) |
+  exists(Namespace ns |
+    result = resolvePath0(path, ns, _) and
+    if path = any(ImplItemNode i).getSelfPath() then not result instanceof TraitItemNode else any()
+  |
     pathUsesNamespace(path, ns)
     or
     not pathUsesNamespace(path, _) and

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

@@ -224,8 +224,9 @@ private import M2
 module Consistency {
   import M2::Consistency
 
-  query predicate nonUniqueCertainType(AstNode n, TypePath path) {
-    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1
+  query predicate nonUniqueCertainType(AstNode n, TypePath path, Type t) {
+    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1 and
+    t = CertainTypeInference::inferCertainType(n, path)
   }
 }
 
@@ -2484,7 +2485,6 @@ private module Debug {
 
   Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    Consistency::nonUniqueCertainType(n, path) and
-    result = CertainTypeInference::inferCertainType(n, path)
+    Consistency::nonUniqueCertainType(n, path, result)
   }
 }

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

@@ -31,5 +31,5 @@ int getTypeInferenceInconsistencyCounts(string type) {
   result = count(TypeMention tm | illFormedTypeMention(tm) | tm)
   or
   type = "Non-unique certain type information" and
-  result = count(AstNode n, TypePath path | nonUniqueCertainType(n, path) | n)
+  result = count(AstNode n, TypePath path | nonUniqueCertainType(n, path, _) | n)
 }