Address review comments

Author: hvitved

rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll

@@ -37,5 +37,15 @@ module Impl {
 
     /** Gets a type argument of this list. */
     TypeRepr getATypeArg() { result = this.getTypeArg(_) }
+
+    /** Gets the associated type argument with the given `name`, if any. */
+    pragma[nomagic]
+    TypeRepr getAssocTypeArg(string name) {
+      exists(AssocTypeArg arg |
+        arg = this.getAGenericArg() and
+        result = arg.getTypeRepr() and
+        name = arg.getIdentifier().getText()
+      )
+    }
   }
 }

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

@@ -112,10 +112,7 @@ private module Input2 implements InputSig2 {
 
   class TypeMention = TM::TypeMention;
 
-  TypeMention getABaseTypeMention(Type t) {
-    result =
-      t.(ImplTraitReturnType).getImplTraitTypeRepr().getTypeBoundList().getABound().getTypeRepr()
-  }
+  TypeMention getABaseTypeMention(Type t) { none() }
 
   TypeMention getATypeParameterConstraint(TypeParameter tp) {
     result = tp.(TypeParamTypeParameter).getTypeParam().getTypeBoundList().getABound().getTypeRepr()

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

@@ -56,6 +56,29 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
 
   ItemNode getResolved() { result = resolved }
 
+  pragma[nomagic]
+  private TypeAlias getResolvedTraitAlias(string name) {
+    exists(TraitItemNode trait |
+      trait = resolvePath(path) and
+      result = trait.getAnAssocItem() and
+      name = result.getName().getText()
+    )
+  }
+
+  pragma[nomagic]
+  private TypeRepr getAssocTypeArg(string name) {
+    result = path.getSegment().getGenericArgList().getAssocTypeArg(name)
+  }
+
+  /** Gets the type argument for the associated type `alias`, if any. */
+  pragma[nomagic]
+  private TypeRepr getAnAssocTypeArgument(TypeAlias alias) {
+    exists(string name |
+      alias = this.getResolvedTraitAlias(name) and
+      result = this.getAssocTypeArg(name)
+    )
+  }
+
   override TypeMention getTypeArgument(int i) {
     result = path.getSegment().getGenericArgList().getTypeArg(i)
     or
@@ -96,6 +119,11 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
       result = alias.getTypeRepr() and
       param.getIndex() = i
     )
+    or
+    exists(TypeAlias alias |
+      result = this.getAnAssocTypeArgument(alias) and
+      traitAliasIndex(_, i, alias)
+    )
   }
 
   /**
@@ -150,44 +178,6 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
     not exists(resolved.(TypeAlias).getTypeRepr()) and
     result = super.resolveTypeAt(typePath)
   }
-
-  pragma[nomagic]
-  private TypeAlias getResolvedTraitAlias(string name) {
-    exists(TraitItemNode trait |
-      trait = resolvePath(path) and
-      result = trait.getAnAssocItem() and
-      name = result.getName().getText()
-    )
-  }
-
-  pragma[nomagic]
-  private TypeRepr getAssocTypeArg(string name) {
-    exists(AssocTypeArg arg |
-      arg = path.getSegment().getGenericArgList().getAGenericArg() and
-      result = arg.getTypeRepr() and
-      name = arg.getIdentifier().getText()
-    )
-  }
-
-  /** Gets the type argument for the associated type `alias`, if any. */
-  pragma[nomagic]
-  private TypeRepr getAnAssocTypeArgument(TypeAlias alias) {
-    exists(string name |
-      alias = this.getResolvedTraitAlias(name) and
-      result = this.getAssocTypeArg(name)
-    )
-  }
-
-  override TypeMention getMentionAt(TypePath tp) {
-    result = super.getMentionAt(tp)
-    or
-    exists(TypeAlias alias, AssociatedTypeTypeParameter attp, TypeMention arg, TypePath suffix |
-      arg = this.getAnAssocTypeArgument(alias) and
-      result = arg.getMentionAt(suffix) and
-      tp = TypePath::cons(attp, suffix) and
-      attp.getTypeAlias() = alias
-    )
-  }
 }
 
 class ImplTraitTypeReprMention extends TypeMention instanceof ImplTraitTypeRepr {