Rust: Rename Impl::getTrait to Impl::getTraitTy

Author: hvitved

rust/ast-generator/src/main.rs

@@ -45,6 +45,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         (_, "ty") => "type_repr",
         ("Function", "body") => "function_body",
         ("ClosureExpr", "body") => "closure_body",
+        ("Impl", "trait_") => "trait_ty",
         _ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
         _ => field_name,
     };

rust/extractor/src/generated/.generated.list

@@ -13,7 +13,7 @@ private import codeql.rust.elements.internal.generated.Impl
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * An `impl`` block.
+   * An `impl` block.
    *
    * For example:
    * ```rust
@@ -26,9 +26,9 @@ module Impl {
     override string toStringImpl() {
       exists(string trait |
         (
-          trait = this.getTrait().toAbbreviatedString() + " for "
+          trait = this.getTraitTy().toAbbreviatedString() + " for "
           or
-          not this.hasTrait() and trait = ""
+          not this.hasTraitTy() and trait = ""
         ) and
         result = "impl " + trait + this.getSelfTy().toAbbreviatedString() + " { ... }"
       )
@@ -38,6 +38,6 @@ module Impl {
      * Holds if this is an inherent `impl` block, that is, one that does not implement a trait.
      */
     pragma[nomagic]
-    predicate isInherent() { not this.hasTrait() }
+    predicate isInherent() { not this.hasTraitTy() }
   }
 }