Merge branch 'aibaars/rust-format-templates' into aibaars/local-defs

rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll

@@ -278,9 +278,26 @@ class FormatArgsExprTree extends StandardPostOrderTree, FormatArgsExpr {
     i = -1 and result = this.getTemplate()
     or
     result = this.getArg(i).getExpr()
+    or
+    result =
+      any(ImplicitVariableAccess v, Format f, int index, int kind |
+        f = this.getFormat(index) and
+        (
+          v.getArgument() = f.getArgumentRef() and kind = 0
+          or
+          v.getArgument() = f.getWidthArgument() and kind = 1
+          or
+          v.getArgument() = f.getPrecisionArgument() and kind = 2
+        ) and
+        i = this.getNumberOfArgs() + index * 3 + kind
+      |
+        v
+      )
   }
 }
 
+class ImplictVariableAccessTree extends LeafTree, ImplicitVariableAccess { }
+
 class IndexExprTree extends StandardPostOrderTree instanceof IndexExpr {
   override AstNode getChildNode(int i) {
     i = 0 and result = super.getBase()