Rust: Include index in Format.getArgument
#18445
Conversation
hvitved
force-pushed
the
rust/format-args-index
branch
from
198d94b to
033cd17
Compare
hvitved
force-pushed
the
rust/format-args-index
branch
from
6cb3ef0 to
0dccbb9
Compare
There was a problem hiding this comment.
Copilot reviewed 7 out of 13 changed files in this pull request and generated no comments.
Files not reviewed (6)
- rust/ql/.generated.list: Language not supported
- rust/ql/lib/codeql/rust/AstConsistency.qll: Language not supported
- rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll: Language not supported
- rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll: Language not supported
- rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll: Language not supported
- rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected: Language not supported
Tip: If you use Visual Studio Code, you can request a review from Copilot before you push from the "Source Control" tab. Learn more
| @@ -40,6 +40,16 @@ module Impl { | |||
|
|
|||
| override Format getParent() { result = Synth::TFormat(parent, index, _, _) } | |||
|
|
|||
| /** Gets the position of this argument. */ | |||
There was a problem hiding this comment.
This predicate might be a bit confusing. I think it should be dropped.
There are named and positional arguments which can be mixed to some extent. Not sure what the "position" of a named argument would mean, and it would be strange if getPosition does not coincide with the position of a positional argument. For example:
let width = 2;
println!("Value {value:#precision$.0$}", width, precision = 3, value = 100);would have getPosition() = 2 for 0 .
| @@ -42,7 +42,9 @@ module Impl { | |||
|
|
|||
| override int getIndex() { result = index } | |||
|
|
|||
| override FormatArgument getArgument() { result.getParent() = this } | |||
| override FormatArgument getArgument(int i) { | |||
There was a problem hiding this comment.
The old definition of getArgument() was clearly wrong. I think I simply forgot to remove the argument field from the schema, so we could just delete this predicate. If you want to keep it, that's fine too.
A
Formatcan have multipleFormatArguments, sogetArgumentmust take an index. I have added two new consistency checks as well, one of which (multipleChildren) would fail prior to this PR.