Skip to content

Commit 8f8f6f7

Browse files
committed
Rust: Add use+self path resolution test
1 parent c911761 commit 8f8f6f7

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

rust/ql/test/library-tests/path-resolution/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,4 +496,5 @@ fn main() {
496496
m16::f(); // $ item=I83
497497
m17::f(); // $ item=I99
498498
nested6::f(); // $ item=I116
499+
nested8::f(); // $ MISSING: item=I119
499500
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ fn g() {
66
} // I9
77

88
pub use nested2::nested5::*; // $ item=I114
9+
10+
pub use nested2::nested7::nested8::{self}; // $ item=I118

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,11 @@ pub mod nested5 {
1717
} // I116
1818
} // I115
1919
} // I114
20+
21+
pub mod nested7 {
22+
pub mod nested8 {
23+
pub fn f() {
24+
println!("nested2.rs::nested7::nested8::f");
25+
} // I119
26+
} // I118
27+
} // I117

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ mod
2626
| my2/nested2.rs:2:5:10:5 | mod nested4 |
2727
| my2/nested2.rs:13:1:19:1 | mod nested5 |
2828
| my2/nested2.rs:14:5:18:5 | mod nested6 |
29+
| my2/nested2.rs:21:1:27:1 | mod nested7 |
30+
| my2/nested2.rs:22:5:26:5 | mod nested8 |
2931
| my.rs:1:1:1:15 | mod nested |
3032
| my/nested.rs:1:1:17:1 | mod nested1 |
3133
| my/nested.rs:2:5:11:5 | mod nested2 |
@@ -48,7 +50,7 @@ resolvePath
4850
| main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
4951
| main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
5052
| main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
51-
| main.rs:40:9:40:13 | super | main.rs:1:1:499:2 | SourceFile |
53+
| main.rs:40:9:40:13 | super | main.rs:1:1:500:2 | SourceFile |
5254
| main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
5355
| main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
5456
| main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -60,7 +62,7 @@ resolvePath
6062
| main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
6163
| main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
6264
| main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
63-
| main.rs:68:5:68:8 | self | main.rs:1:1:499:2 | SourceFile |
65+
| main.rs:68:5:68:8 | self | main.rs:1:1:500:2 | SourceFile |
6466
| main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
6567
| main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
6668
| main.rs:81:17:81:19 | Foo | main.rs:77:9:79:9 | struct Foo |
@@ -74,7 +76,7 @@ resolvePath
7476
| main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
7577
| main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
7678
| main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
77-
| main.rs:117:13:117:17 | super | main.rs:1:1:499:2 | SourceFile |
79+
| main.rs:117:13:117:17 | super | main.rs:1:1:500:2 | SourceFile |
7880
| main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
7981
| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
8082
| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -259,6 +261,9 @@ resolvePath
259261
| my2/mod.rs:5:5:5:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
260262
| my2/mod.rs:8:9:8:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
261263
| my2/mod.rs:8:9:8:24 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
264+
| my2/mod.rs:10:9:10:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
265+
| my2/mod.rs:10:9:10:24 | ...::nested7 | my2/nested2.rs:21:1:27:1 | mod nested7 |
266+
| my2/mod.rs:10:9:10:33 | ...::nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
262267
| my.rs:3:5:3:10 | nested | my.rs:1:1:1:15 | mod nested |
263268
| my.rs:3:5:3:13 | ...::g | my/nested.rs:19:1:22:1 | fn g |
264269
| my.rs:11:5:11:5 | g | my/nested.rs:19:1:22:1 | fn g |

0 commit comments

Comments
 (0)