Rust: Improve a few toString implementations

Author: paldepind

rust/ql/.generated.list

@@ -36,5 +36,9 @@ module Impl {
     predicate isInReturnPos() {
       exists(Function f | f.getRetType().getTypeRepr() = this.getFunctionTypeRepr(f))
     }
+
+    override string toStringImpl() {
+      result = "impl " + this.getTypeBoundList().toAbbreviatedString()
+    }
   }
 }

rust/ql/.gitattributes

@@ -22,7 +22,9 @@ module Impl {
    * ```
    */
   class Lifetime extends Generated::Lifetime {
-    override string toStringImpl() {
+    override string toStringImpl() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() {
       result = this.getText()
       or
       not this.hasText() and result = "'_"

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

@@ -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 `TypeBound`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.TypeBound
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A type bound in a trait or generic parameter.
    *
@@ -23,5 +23,12 @@ module Impl {
    * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
-  class TypeBound extends Generated::TypeBound { }
+  class TypeBound extends Generated::TypeBound {
+    override string toAbbreviatedString() {
+      result = this.getLifetime().toAbbreviatedString()
+      or
+      not this.hasLifetime() and
+      result = "..."
+    }
+  }
 }

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

@@ -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 `TypeBoundList`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.TypeBoundList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A list of type bounds.
    *
@@ -21,5 +21,15 @@ module Impl {
    * //        ^^^^^^^^^^^^^
    * ```
    */
-  class TypeBoundList extends Generated::TypeBoundList { }
+  class TypeBoundList extends Generated::TypeBoundList {
+    override string toStringImpl() { result = this.toAbbreviatedString() }
+
+    private string toAbbreviatedStringPart(int index) {
+      result = this.getBound(index).toAbbreviatedString()
+    }
+
+    override string toAbbreviatedString() {
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i), " + " order by i)
+    }
+  }
 }