wip

Author: hvitved

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

@@ -1531,7 +1531,10 @@ private module MethodCallResolution {
     ) {
       exists(MethodCall mc, string name, int arity |
         mcc.hasSignature(mc, _, _, name, arity) and
-        methodCallBlanketCandidate(mc, m, _, _, blanketPath, blanketTypeParam)
+        methodCallBlanketCandidate(mc, m, _, _, blanketPath, blanketTypeParam) and
+        // inherent methods take precedence over trait methods, so only allow
+        // trait methods when there are no matching inherent methods
+        mcc.hasNoInherentTarget()
       )
     }
   }
@@ -1544,23 +1547,36 @@ private module MethodCallResolution {
     IsInstantiationOfInputSig<MethodCallCand, FunctionType>
   {
     pragma[nomagic]
-    predicate potentialInstantiationOf(
-      MethodCallCand mcc, TypeAbstraction abs, FunctionType constraint
+    additional predicate potentialInstantiationOf0(
+      MethodCallCand mcc, ImplOrTraitItemNode i, FunctionType selfType
     ) {
       exists(
         MethodCall mc, Method m, string name, int arity, TypePath strippedTypePath,
         Type strippedType
       |
         mcc.hasSignature(mc, strippedTypePath, strippedType, name, arity)
       |
-        methodCallNonBlanketCandidate(mc, m, abs, constraint, strippedTypePath, strippedType)
+        methodCallNonBlanketCandidate(mc, m, i, selfType, strippedTypePath, strippedType)
         or
-        methodCallBlanketCandidate(mc, m, abs, constraint, _, _) and
+        methodCallBlanketCandidate(mc, m, i, selfType, _, _) and
         BlanketImplementation::SatisfiesBlanketConstraint<MethodCallCand, SatisfiesBlanketConstraintInput>::satisfiesBlanketConstraint(mcc,
           m)
       )
     }
 
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      MethodCallCand mcc, TypeAbstraction abs, FunctionType constraint
+    ) {
+      potentialInstantiationOf0(mcc, abs, constraint) and
+      if abs.(Impl).hasTrait()
+      then
+        // inherent methods take precedence over trait methods, so only allow
+        // trait methods when there are no matching inherent methods
+        mcc.hasNoInherentTarget()
+      else any()
+    }
+
     predicate relevantTypeMention(FunctionType constraint) {
       methodInfo(_, _, _, _, constraint, _, _)
     }
@@ -1597,7 +1613,7 @@ private module MethodCallResolution {
     predicate potentialInstantiationOf(
       MethodCallCand mcc, TypeAbstraction abs, FunctionType constraint
     ) {
-      MethodCallReceiverIsInstantiationOfInput::potentialInstantiationOf(mcc, abs, constraint) and
+      MethodCallReceiverIsInstantiationOfInput::potentialInstantiationOf0(mcc, abs, constraint) and
       abs = any(Impl i | not i.hasTrait())
     }