Rust: rename {Implicit,FormatTemplate}VariableAccess

github · Oct 22, 2024 · 1f80f7b · 1f80f7b
1 parent 61a74d3
commit 1f80f7b
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 104 deletions.
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -94,7 +94,7 @@ class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
     result = this.getArg(i).getExpr()
     or
     result =
-      any(ImplicitVariableAccess v, Format f, int index, int kind |
+      any(FormatTemplateVariableAccess v, Format f, int index, int kind |
         f = this.getFormat(index) and
         (
           v.getArgument() = f.getArgumentRef() and kind = 0
@@ -110,7 +110,7 @@ class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
   }
 }
 
-class ImplictVariableAccessTree extends LeafTree, ImplicitVariableAccess { }
+class FormatTemplateVariableAccessTree extends LeafTree, FormatTemplateVariableAccess { }
 
 class ItemTree extends LeafTree, Item {
   ItemTree() {

diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
diff --git a/rust/ql/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll b/rust/ql/lib/codeql/rust/elements/FormatTemplateVariableAccess.qll
diff --git a/rust/ql/lib/codeql/rust/elements/ImplicitVariableAccess.qll b/rust/ql/lib/codeql/rust/elements/ImplicitVariableAccess.qll
diff --git a/...nal/ImplicitVariableAccessConstructor.qll → ...rmatTemplateVariableAccessConstructor.qll b/...nal/ImplicitVariableAccessConstructor.qll → ...rmatTemplateVariableAccessConstructor.qll
@@ -1,6 +1,6 @@
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ImplicitVariableAccess` synthesized instances.
+ *  `FormatTemplateVariableAccess` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
@@ -10,10 +10,10 @@ private import codeql.rust.elements.Format
 private import codeql.rust.elements.NamedFormatArgument
 
 /**
- *  The characteristic predicate of `ImplicitVariableAccess` synthesized instances.
+ *  The characteristic predicate of `FormatTemplateVariableAccess` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructImplicitVariableAccess(Raw::FormatArgsExpr parent, int index, int kind) {
+predicate constructFormatTemplateVariableAccess(Raw::FormatArgsExpr parent, int index, int kind) {
   unboundNamedFormatArgument(parent, index, kind, _)
 }
 

diff --git a/...s/internal/ImplicitVariableAccessImpl.qll → ...rnal/FormatTemplateVariableAccessImpl.qll b/...s/internal/ImplicitVariableAccessImpl.qll → ...rnal/FormatTemplateVariableAccessImpl.qll
@@ -1,27 +1,27 @@
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ImplicitVariableAccess`.
+ * This module provides a hand-modifiable wrapper around the generated class `FormatTemplateVariableAccess`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ImplicitVariableAccess
-private import codeql.rust.elements.internal.ImplicitVariableAccessConstructor
+private import codeql.rust.elements.internal.generated.FormatTemplateVariableAccess
+private import codeql.rust.elements.internal.FormatTemplateVariableAccessConstructor
 private import codeql.rust.elements.internal.generated.Raw
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.Format
 private import codeql.rust.elements.NamedFormatArgument
 
 /**
- * INTERNAL: This module contains the customizable definition of `ImplicitVariableAccess` and should not
+ * INTERNAL: This module contains the customizable definition of `FormatTemplateVariableAccess` and should not
  * be referenced directly.
  */
 module Impl {
-  class ImplicitVariableAccess extends Generated::ImplicitVariableAccess {
+  class FormatTemplateVariableAccess extends Generated::FormatTemplateVariableAccess {
     private NamedFormatArgument argument;
 
-    ImplicitVariableAccess() {
+    FormatTemplateVariableAccess() {
       exists(Raw::FormatArgsExpr parent, int index, int kind |
-        this = Synth::TImplicitVariableAccess(parent, index, kind) and
+        this = Synth::TFormatTemplateVariableAccess(parent, index, kind) and
         unboundNamedFormatArgument(parent, index, kind, argument)
       )
     }