wip2

Author: hvitved

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

@@ -1354,7 +1354,7 @@ private module AssocFunctionResolution {
    * `i`, and the type at position `posAdj` is `t`.
    */
   pragma[nomagic]
-  predicate assocFunctionInfo(
+  private predicate assocFunctionInfo(
     Function f, string name, int arity, ImplOrTraitItemNode i, FunctionPosition posAdj,
     AssocFunctionType t
   ) {
@@ -3087,59 +3087,17 @@ private class TupleLikeVariant extends TupleLikeConstructor instanceof Variant {
 }
 
 /**
- * A matching configuration for resolving types of tuple variants and tuple structs
- * such as `Result::Ok(42)`.
+ * A matching configuration for resolving types of tuple-like variants and tuple
+ * structs such as `Result::Ok(42)`.
  */
 private module TupleLikeConstructionMatchingInput implements MatchingInputSig {
   import FunctionPositionMatchingInput
 
-  private newtype TDeclaration = TTupleLikeConstructorDeclaration(TupleLikeConstructor tc)
-
-  abstract class Declaration extends TDeclaration {
-    abstract TypeParameter getTypeParameter(TypeParameterPosition ppos);
-
-    pragma[nomagic]
-    abstract Type getParameterType(DeclarationPosition dpos, TypePath path);
-
-    abstract Type getReturnType(TypePath path);
-
-    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      result = this.getParameterType(dpos, path)
-      or
-      dpos.isReturn() and
-      result = this.getReturnType(path)
-    }
-
-    abstract string toString();
-
-    abstract Location getLocation();
-  }
-
-  private class TupleLikeConstructorDeclaration extends Declaration,
-    TTupleLikeConstructorDeclaration
-  {
-    TupleLikeConstructor tc;
-
-    TupleLikeConstructorDeclaration() { this = TTupleLikeConstructorDeclaration(tc) }
-
-    override TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = tc.getTypeParameter(ppos)
-    }
-
-    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
-      result = tc.getParameterType(dpos, path)
-    }
-
-    override Type getReturnType(TypePath path) { result = tc.getReturnType(path) }
-
-    override string toString() { result = tc.toString() }
-
-    override Location getLocation() { result = tc.getLocation() }
-  }
+  class Declaration = TupleLikeConstructor;
 
   class Access extends CallExpr, ContextTyping::ContextTypedCallCand {
     Access() {
-      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | not i instanceof Method)
+      forex(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | not i instanceof Function)
     }
 
     pragma[nomagic]
@@ -3162,27 +3120,17 @@ private module TupleLikeConstructionMatchingInput implements MatchingInputSig {
     }
 
     pragma[nomagic]
-    private ItemNode resolveCallTargetViaPathResolution() {
-      result = CallExprImpl::getResolvedFunction(this) and
-      not result instanceof AssocFunction
-    }
-
-    pragma[inline]
-    Declaration getTarget() {
-      exists(ItemNode i | i = this.resolveCallTargetViaPathResolution() |
-        result = TTupleLikeConstructorDeclaration(i)
-      )
-    }
+    Declaration getTarget() { result = CallExprImpl::getResolvedFunction(this) }
 
     /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
+     * Holds if the return type of this tuple-like construction at `path` may have to be inferred
+     * from the context, for example in `Result::Ok(42)` the error type has to be inferred from the
+     * context.
      */
     pragma[nomagic]
     predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
-      // Tuple declarations, such as `Result::Ok(...)`, may also be context typed
       exists(TupleLikeConstructor tc, TypeParameter tp |
-        tc = this.resolveCallTargetViaPathResolution() and
+        tc = this.getTarget() and
         pos.isReturn() and
         tp = tc.getReturnType(path) and
         not tp = tc.getParameterType(_, _) and