Skip to content

Commit 1d0e427

Browse files
committed
Rust: Add more path resolution tests
1 parent 2cd1d2f commit 1d0e427

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

rust/ql/test/library-tests/path-resolution/my2/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ pub use nested2::nested5::*; // $ item=I114
99

1010
pub use nested2::nested7::nested8::{self}; // $ item=I118
1111

12+
use nested2::nested5::nested6::f as nested6_f; // $ item=I116
13+
1214
pub mod my3;
1315

1416
#[path = "renamed.rs"]

rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ pub fn f() {
66

77
use super::super::h; // $ item=I25
88
use super::g; // $ item=I9
9+
10+
use super::nested6_f; // $ MISSING: item=I116

rust/ql/test/library-tests/path-resolution/path-resolution.expected

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ mod
3232
| main.rs:621:1:689:1 | mod m24 |
3333
| main.rs:706:1:758:1 | mod associated_types |
3434
| my2/mod.rs:1:1:1:16 | mod nested2 |
35-
| my2/mod.rs:12:1:12:12 | mod my3 |
36-
| my2/mod.rs:14:1:15:10 | mod mymod |
35+
| my2/mod.rs:14:1:14:12 | mod my3 |
36+
| my2/mod.rs:16:1:17:10 | mod mymod |
3737
| my2/nested2.rs:1:1:11:1 | mod nested3 |
3838
| my2/nested2.rs:2:5:10:5 | mod nested4 |
3939
| my2/nested2.rs:13:1:19:1 | mod nested5 |
@@ -397,7 +397,7 @@ resolvePath
397397
| main.rs:787:5:787:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
398398
| main.rs:788:5:788:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
399399
| main.rs:788:5:788:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
400-
| main.rs:789:5:789:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
400+
| main.rs:789:5:789:7 | my3 | my2/mod.rs:14:1:14:12 | mod my3 |
401401
| main.rs:789:5:789:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
402402
| main.rs:790:5:790:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
403403
| main.rs:791:5:791:7 | m18 | main.rs:547:1:565:1 | mod m18 |
@@ -422,15 +422,20 @@ resolvePath
422422
| my2/mod.rs:10:9:10:24 | ...::nested7 | my2/nested2.rs:21:1:27:1 | mod nested7 |
423423
| my2/mod.rs:10:9:10:33 | ...::nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
424424
| my2/mod.rs:10:37:10:40 | self | my2/nested2.rs:22:5:26:5 | mod nested8 |
425-
| my2/mod.rs:17:5:17:9 | mymod | my2/mod.rs:14:1:15:10 | mod mymod |
426-
| my2/mod.rs:17:5:17:12 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
425+
| my2/mod.rs:12:5:12:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
426+
| my2/mod.rs:12:5:12:20 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
427+
| my2/mod.rs:12:5:12:29 | ...::nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
428+
| my2/mod.rs:12:5:12:32 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
429+
| my2/mod.rs:19:5:19:9 | mymod | my2/mod.rs:16:1:17:10 | mod mymod |
430+
| my2/mod.rs:19:5:19:12 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
427431
| my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
428432
| my2/my3/mod.rs:4:5:4:5 | h | main.rs:50:1:69:1 | fn h |
429-
| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
433+
| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:19:30 | SourceFile |
430434
| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:799:2 | SourceFile |
431435
| my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:50:1:69:1 | fn h |
432-
| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
436+
| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:19:30 | SourceFile |
433437
| my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
438+
| my2/my3/mod.rs:10:5:10:9 | super | my2/mod.rs:1:1:19:30 | SourceFile |
434439
| my.rs:3:5:3:10 | nested | my.rs:1:1:1:15 | mod nested |
435440
| my.rs:3:5:3:13 | ...::g | my/nested.rs:19:1:22:1 | fn g |
436441
| my.rs:11:5:11:5 | g | my/nested.rs:19:1:22:1 | fn g |

0 commit comments

Comments
 (0)