WIP

Author: paldepind

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

@@ -1765,7 +1765,14 @@ private module BlanketImplementation {
     t =
       rank[1](Trait trait, int i |
         trait = getBlanketImplementationTypeParam(impl).resolveBound(i) and
-        not trait.getName().getText() = ["Sized", "Fn", "FnOnce", "FnMut"]
+        // Exclude traits that are "trivial" in the sense that they are known to
+        // not narrow things down very much.
+        not trait.getName().getText() =
+          [
+            "Sized", "Clone", "Fn", "FnOnce", "FnMut",
+            // The auto traits
+            "Send", "Sync", "Unpin", "UnwindSafe", "RefUnwindSafe"
+          ]
       |
         trait order by i
       )
@@ -1793,12 +1800,18 @@ private module BlanketImplementation {
     Impl impl, Trait trait, string name, int arity, Function f
   ) {
     isCanonicalBlanketImplementation(impl) and
-    f = impl.(ImplItemNode).getASuccessor(name) and
     blanketImplementationTraitBound(impl, trait) and
     f.getParamList().hasSelfParam() and
     arity = f.getParamList().getNumberOfParams() and
     // Make this stronger and document
-    not trait.(TraitItemNode).getASuccessor(name) = f
+    (
+      f = impl.(ImplItemNode).getAssocItem(name)
+      or
+      f = impl.(ImplItemNode).resolveTraitTy().getAssocItem(name) and
+      not f = impl.(ImplItemNode).getAssocItem(name)
+    ) and
+    not getBlanketImplementationTypeParam(impl).resolveABound().(TraitItemNode).getASuccessor(name) =
+      f
   }
 
   predicate methodCallMatchesBlanketImpl(MethodCall mc, Type t, Impl impl, Trait trait, Function f) {
@@ -1821,13 +1834,6 @@ private module BlanketImplementation {
     predicate useUniversalConditions() { none() }
   }
 
-  predicate debugSatisfiesConstraintType(MethodCall mc, Trait trait, TypePath path, Type ty) {
-    SatisfiesConstraint<MethodCall, SatisfiesConstraintInput>::satisfiesConstraintType(mc,
-      TTrait(trait), path, ty) and
-    // 521 results
-    trait.getName().getText() = "TryFuture"
-  }
-
   predicate getBlanketImpl(MethodCall mc, Type t, Impl impl, Trait trait, Function f) {
     SatisfiesConstraint<MethodCall, SatisfiesConstraintInput>::satisfiesConstraintType(mc,
       TTrait(trait), _, _) and