Merge pull request #20393 from paldepind/rust/impl-to-string

Rust: Improve `toString` for `impl`

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)
+    }
+  }
 }

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

@@ -9,4 +9,4 @@ getRetType
 getReturnTypeSyntax
 getTypeRepr
 getTypeBoundList
-| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | gen_assoc_type_arg.rs:9:27:9:31 | TypeBoundList |
+| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | gen_assoc_type_arg.rs:9:27:9:31 | ... |

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

@@ -1,4 +1,4 @@
 instances
 | gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr |
 getTypeBoundList
-| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | gen_dyn_trait_type_repr.rs:7:17:7:21 | TypeBoundList |
+| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | gen_dyn_trait_type_repr.rs:7:17:7:21 | ... |

rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected

@@ -1,4 +1,4 @@
 instances
-| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr |
+| gen_impl_trait_type_repr.rs:7:17:7:41 | impl ... |
 getTypeBoundList
-| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr | gen_impl_trait_type_repr.rs:7:22:7:41 | TypeBoundList |
+| gen_impl_trait_type_repr.rs:7:17:7:41 | impl ... | gen_impl_trait_type_repr.rs:7:22:7:41 | ... |

rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected

@@ -6,6 +6,6 @@ getGenericParamList
 getName
 | gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:11:7:13 | Foo |
 getTypeBoundList
-| gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:17:7:25 | TypeBoundList |
+| gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:17:7:25 | ... + ... |
 getVisibility
 getWhereClause