Skip to content

Commit c831a8c

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

File tree

5 files changed

+431
-407
lines changed

5 files changed

+431
-407
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
multipleCallTargets
2-
| main.rs:118:9:118:11 | f(...) |
2+
| main.rs:124:9:124:11 | f(...) |
3+
| main.rs:774:5:774:7 | f(...) |
34
| proc_macro.rs:9:5:9:10 | ...::new(...) |

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ mod my2; // I14
88

99
use my2::*; // $ item=I14
1010

11-
use my2::nested2::nested3::nested4::{f, g}; // $ item=I11 item=I12 item=I13
11+
#[rustfmt::skip]
12+
use my2::nested2::nested3::nested4::{ // $ item=I11
13+
f, // $ item=I12
14+
g, // $ item=I13
15+
};
16+
17+
use my2::nested8_f; // $ item=I119
1218

1319
mod m1 {
1420
fn f() {
@@ -765,7 +771,7 @@ fn main() {
765771
my::nested::nested1::nested2::f(); // $ item=I4
766772
my::f(); // $ item=I38
767773
nested2::nested3::nested4::f(); // $ item=I12
768-
f(); // $ item=I12
774+
f(); // $ item=I12 $ SPURIOUS: item=I119
769775
g(); // $ item=I13
770776
crate::h(); // $ item=I25
771777
m1::m2::g(); // $ item=I19

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ fn g() {
77

88
pub use nested2::nested5::*; // $ item=I114
99

10-
pub use nested2::nested7::nested8::{self}; // $ item=I118
10+
#[rustfmt::skip]
11+
pub use nested2::nested7::nested8::{ // $ item=I118
12+
self, // $ item=I118
13+
f as nested8_f // $ item=I119
14+
};
15+
16+
use nested2::nested5::nested6::f as nested6_f; // $ item=I116
1117

1218
pub mod my3;
1319

1420
#[path = "renamed.rs"]
1521
mod mymod;
1622

17-
use mymod::f; // $ item=I1001
23+
pub use mymod::f; // $ item=I1001

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

0 commit comments

Comments
 (0)