Rust: tweak PathType string representations and add one for InferType

Author: Paolo Tranquilli

rust/ql/.generated.list

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `GenericArgList`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.GenericArgList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * The base class for generic arguments.
    * ```rust
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class GenericArgList extends Generated::GenericArgList { }
+  class GenericArgList extends Generated::GenericArgList {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "<...>" }
+  }
 }

rust/ql/.gitattributes

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `InferType`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.InferType
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A InferType. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class InferType extends Generated::InferType { }
+  class InferType extends Generated::InferType {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "_" }
+  }
 }

rust/ql/lib/codeql/rust/elements/PathType.qll

@@ -19,17 +19,16 @@ module Impl {
     override string toString() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
-      result = this.getAbbreviatedPrefix() + this.getAbbreviatedGenericArgList()
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i), "::" order by i)
     }
 
-    private string getAbbreviatedGenericArgList() {
-      if this.hasGenericArgList() then result = "::<...>" else result = ""
-    }
-
-    private string getAbbreviatedPrefix() {
+    private string toAbbreviatedStringPart(int index) {
+      index = 0 and
       if this.hasPathType() or this.hasTy()
       then result = "<...>"
       else result = this.getNameRef().getText()
+      or
+      index = 1 and result = this.getGenericArgList().toAbbreviatedString()
     }
   }
 }

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

@@ -13,16 +13,15 @@ private import codeql.rust.elements.internal.generated.PathType
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A PathType. For example:
+   * A type referring to a path. For example:
    * ```rust
-   * todo!()
+   * type X = std::collections::HashMap<i32, i32>;
+   * type Y = X::Item;
    * ```
    */
   class PathType extends Generated::PathType {
     override string toString() { result = this.toAbbreviatedString() }
 
-    override string toAbbreviatedString() {
-      result = "<" + this.getPath().toAbbreviatedString() + ">"
-    }
+    override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
   }
 }