Skip to content

Rust: Adjust jump-to-def for paths with generic arguments #20248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 21, 2025
Merged

Rust: Adjust jump-to-def for paths with generic arguments #20248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cd8c90
Rust: Add more jump-to-def tests
hvitved Aug 19, 2025
714423d
Rust: Adjust jump-to-def for paths with generic arguments
hvitved Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rust/ql/lib/codeql/rust/internal/Definitions.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ private class PositionalFormatArgumentUse extends Use instanceof PositionalForma
override string getUseType() { result = "format argument" }
}

private class PathUse extends Use instanceof PathSegment {
private class PathUse extends Use instanceof NameRef {
private Path path;

PathUse() { this = path.getSegment() }
PathUse() { this = path.getSegment().getIdentifier() }

private CallExpr getCall() { result.getFunction().(PathExpr).getPath() = path }

Expand Down
61 changes: 36 additions & 25 deletions rust/ql/test/library-tests/definitions/Definitions.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,39 @@
| main.rs:9:14:9:14 | S | main.rs:7:9:7:21 | struct S | path |
| main.rs:10:36:10:39 | Self | main.rs:7:9:7:21 | struct S | path |
| main.rs:11:17:11:17 | S | main.rs:7:9:7:21 | struct S | path |
| main.rs:21:22:21:26 | value | main.rs:21:50:21:54 | value | format argument |
| main.rs:21:29:21:33 | width | main.rs:18:9:18:13 | width | local variable |
| main.rs:21:36:21:44 | precision | main.rs:19:9:19:17 | precision | local variable |
| main.rs:22:22:22:22 | 0 | main.rs:22:34:22:38 | value | format argument |
| main.rs:22:25:22:25 | 1 | main.rs:22:41:22:45 | width | format argument |
| main.rs:22:28:22:28 | 2 | main.rs:22:48:22:56 | precision | format argument |
| main.rs:22:34:22:38 | value | main.rs:20:9:20:13 | value | local variable |
| main.rs:22:41:22:45 | width | main.rs:18:9:18:13 | width | local variable |
| main.rs:22:48:22:56 | precision | main.rs:19:9:19:17 | precision | local variable |
| main.rs:23:21:23:22 | {} | main.rs:23:29:23:33 | value | format argument |
| main.rs:23:24:23:25 | {} | main.rs:23:36:23:40 | width | format argument |
| main.rs:23:29:23:33 | value | main.rs:20:9:20:13 | value | local variable |
| main.rs:23:36:23:40 | width | main.rs:18:9:18:13 | width | local variable |
| main.rs:25:22:25:27 | people | main.rs:24:9:24:14 | people | local variable |
| main.rs:26:16:26:16 | 1 | main.rs:26:34:26:34 | 2 | format argument |
| main.rs:26:19:26:20 | {} | main.rs:26:31:26:31 | 1 | format argument |
| main.rs:26:23:26:23 | 0 | main.rs:26:31:26:31 | 1 | format argument |
| main.rs:26:26:26:27 | {} | main.rs:26:34:26:34 | 2 | format argument |
| main.rs:27:31:27:35 | {:<5} | main.rs:27:40:27:42 | "x" | format argument |
| main.rs:28:13:28:13 | S | main.rs:1:1:1:9 | struct S | path |
| main.rs:29:13:29:14 | M1 | main.rs:5:1:15:1 | mod M1 | path |
| main.rs:29:17:29:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
| main.rs:29:21:29:21 | S | main.rs:7:9:7:21 | struct S | path |
| main.rs:30:5:30:5 | s | main.rs:29:9:29:9 | s | local variable |
| main.rs:30:7:30:12 | method | main.rs:10:13:12:13 | fn method | method |
| main.rs:16:22:16:22 | T | main.rs:16:19:16:19 | T | path |
| main.rs:18:13:18:14 | S2 | main.rs:16:5:16:24 | struct S2 | path |
| main.rs:18:16:18:16 | T | main.rs:18:10:18:10 | T | path |
| main.rs:19:23:19:23 | T | main.rs:18:10:18:10 | T | path |
| main.rs:19:29:19:32 | Self | main.rs:16:5:16:24 | struct S2 | path |
| main.rs:20:16:20:16 | x | main.rs:19:20:19:20 | x | local variable |
| main.rs:29:22:29:26 | value | main.rs:29:50:29:54 | value | format argument |
| main.rs:29:29:29:33 | width | main.rs:26:9:26:13 | width | local variable |
| main.rs:29:36:29:44 | precision | main.rs:27:9:27:17 | precision | local variable |
| main.rs:30:22:30:22 | 0 | main.rs:30:34:30:38 | value | format argument |
| main.rs:30:25:30:25 | 1 | main.rs:30:41:30:45 | width | format argument |
| main.rs:30:28:30:28 | 2 | main.rs:30:48:30:56 | precision | format argument |
| main.rs:30:34:30:38 | value | main.rs:28:9:28:13 | value | local variable |
| main.rs:30:41:30:45 | width | main.rs:26:9:26:13 | width | local variable |
| main.rs:30:48:30:56 | precision | main.rs:27:9:27:17 | precision | local variable |
| main.rs:31:21:31:22 | {} | main.rs:31:29:31:33 | value | format argument |
| main.rs:31:24:31:25 | {} | main.rs:31:36:31:40 | width | format argument |
| main.rs:31:29:31:33 | value | main.rs:28:9:28:13 | value | local variable |
| main.rs:31:36:31:40 | width | main.rs:26:9:26:13 | width | local variable |
| main.rs:33:22:33:27 | people | main.rs:32:9:32:14 | people | local variable |
| main.rs:34:16:34:16 | 1 | main.rs:34:34:34:34 | 2 | format argument |
| main.rs:34:19:34:20 | {} | main.rs:34:31:34:31 | 1 | format argument |
| main.rs:34:23:34:23 | 0 | main.rs:34:31:34:31 | 1 | format argument |
| main.rs:34:26:34:27 | {} | main.rs:34:34:34:34 | 2 | format argument |
| main.rs:35:31:35:35 | {:<5} | main.rs:35:40:35:42 | "x" | format argument |
| main.rs:36:13:36:13 | S | main.rs:1:1:1:9 | struct S | path |
| main.rs:37:13:37:14 | M1 | main.rs:5:1:23:1 | mod M1 | path |
| main.rs:37:17:37:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
| main.rs:37:21:37:21 | S | main.rs:7:9:7:21 | struct S | path |
| main.rs:38:5:38:5 | s | main.rs:37:9:37:9 | s | local variable |
| main.rs:38:7:38:12 | method | main.rs:10:13:12:13 | fn method | method |
| main.rs:39:5:39:6 | M1 | main.rs:5:1:23:1 | mod M1 | path |
| main.rs:39:9:39:10 | S2 | main.rs:16:5:16:24 | struct S2 | path |
| main.rs:39:14:39:14 | S | main.rs:1:1:1:9 | struct S | path |
| main.rs:39:18:39:20 | new | main.rs:19:9:21:9 | fn new | path |
| main.rs:39:22:39:22 | S | main.rs:1:1:1:9 | struct S | path |
9 changes: 9 additions & 0 deletions rust/ql/test/library-tests/definitions/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ mod M1 {
}
}
}

pub struct S2<T>(T);

impl<T> S2<T> {
pub fn new(x: T) -> Self {
S2(x)
}
}
}

fn main() {
Expand All @@ -28,4 +36,5 @@ fn main() {
let x = S;
let s = M1::M2::S;
s.method();
M1::S2::<S>::new(S);
}
Loading