Rust: Add more path resolution tests

2025-12-16 16:53:25 +01:00 · 2025-02-10 13:49:12 +01:00
parent 0b2e307f9a
commit 985ee92698
3 changed files with 163 additions and 39 deletions
--- a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/AstConsistency.expected
+++ b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/AstConsistency.expected
@@ -1,3 +1,23 @@
 multiplePathResolutions
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
+| main.rs:221:17:221:19 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:221:17:221:19 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:222:9:222:11 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:222:9:222:11 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:236:13:236:15 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:236:13:236:15 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:237:17:237:22 | FooBar | main.rs:228:9:228:17 | FooBar |
+| main.rs:237:17:237:22 | FooBar | main.rs:233:5:233:18 | fn FooBar |
+| main.rs:238:17:238:22 | FooBar | main.rs:228:9:228:17 | FooBar |
+| main.rs:238:17:238:22 | FooBar | main.rs:233:5:233:18 | fn FooBar |
+| main.rs:273:13:273:25 | ...::f | main.rs:269:5:269:17 | fn f |
+| main.rs:273:13:273:25 | ...::f | main.rs:269:19:270:19 | struct f |
+| main.rs:276:17:276:17 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:276:17:276:17 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:277:21:277:21 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:277:21:277:21 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:278:13:278:13 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:278:13:278:13 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:301:5:301:10 | ...::f | main.rs:220:5:223:5 | fn f |
+| main.rs:301:5:301:10 | ...::f | main.rs:225:5:225:12 | mod f |
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -212,6 +212,74 @@ mod m10 {
    }
 }

+mod m11 {
+    pub struct Foo {} // I61
+
+    fn Foo() {} // I62
+
+    pub fn f() {
+        let _ = Foo {}; // $ item=I61 $ SPURIOUS: item=I62
+        Foo(); // $ item=I62 $ SPURIOUS: item=I61
+    } // I63
+
+    mod f {} // I66
+
+    pub enum Bar {
+        FooBar {}, // I64
+    } // I65
+
+    use Bar::FooBar; // $ item=I64
+
+    fn FooBar() {} // I65
+
+    #[rustfmt::skip]
+    fn g(x: Foo) { // $ item=I61 $ SPURIOUS: item=I62
+        let _ = FooBar {}; // $ item=I64 $ SPURIOUS: item=I65
+        let _ = FooBar(); // $ item=I65 $ SPURIOUS: item=I64
+    }
+
+    struct S; // I67
+    enum E {
+        C, // I68
+    }
+
+    use E::C; // $ item=I68
+
+    fn h() {
+        let _ = S; // $ item=I67
+        let _ = C; // $ item=I68
+    }
+}
+
+mod m12 {
+    #[rustfmt::skip]
+    trait MyParamTrait<
+      T // I69
+    > {
+        type AssociatedType; // I70
+
+        fn f(
+            &self,
+            x: T // $ MISSING: item=I69
+        ) -> Self::AssociatedType; // $ MISSING: item=I70
+    }
+}
+
+mod m13 {
+    pub fn f() {} // I71
+    pub struct f {} // I72
+
+    mod m14 {
+        use crate::m13::f; // $ item=I71 item=I72
+
+        #[rustfmt::skip]
+        fn g(x: f) { // $ item=I72 $ SPUROUS: item=I71
+            let _ = f {}; // $ item=I72 $ SPUROUS: item=I71
+            f(); // $ item=I71 $ SPUROUS: item=I72
+        }
+    }
+}
+
 fn main() {
    my::nested::nested1::nested2::f(); // $ item=I4
    my::f(); // $ item=I38
@@ -230,4 +298,5 @@ fn main() {
    m7::f(); // $ item=I45
    m8::g(); // $ item=I55
    m9::f(); // $ item=I57
+    m11::f(); // $ item=I63 $ SPUROUS: item=I66
 }
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -13,6 +13,11 @@ mod
 | main.rs:139:1:182:1 | mod m8 |
 | main.rs:184:1:192:1 | mod m9 |
 | main.rs:194:1:213:1 | mod m10 |
+| main.rs:215:1:252:1 | mod m11 |
+| main.rs:225:5:225:12 | mod f |
+| main.rs:254:1:266:1 | mod m12 |
+| main.rs:268:1:281:1 | mod m13 |
+| main.rs:272:5:280:5 | mod m14 |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/nested2.rs:2:5:10:5 | mod nested4 |
@@ -38,7 +43,7 @@ resolvePath
 | main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
 | main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
 | main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:40:9:40:13 | super | main.rs:1:1:233:2 | SourceFile |
+| main.rs:40:9:40:13 | super | main.rs:1:1:302:2 | SourceFile |
 | main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
 | main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
 | main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -50,7 +55,7 @@ resolvePath
 | main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
 | main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
 | main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
-| main.rs:68:5:68:8 | self | main.rs:1:1:233:2 | SourceFile |
+| main.rs:68:5:68:8 | self | main.rs:1:1:302:2 | SourceFile |
 | main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
 | main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
 | main.rs:81:17:81:19 | Foo | main.rs:77:9:79:9 | struct Foo |
@@ -64,7 +69,7 @@ resolvePath
 | main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
-| main.rs:117:13:117:17 | super | main.rs:1:1:233:2 | SourceFile |
+| main.rs:117:13:117:17 | super | main.rs:1:1:302:2 | SourceFile |
 | main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -99,42 +104,72 @@ resolvePath
 | main.rs:207:7:209:7 | MyStruct::<...> | main.rs:195:5:201:5 | struct MyStruct |
 | main.rs:208:9:208:9 | T | main.rs:204:14:204:14 | TypeParam |
 | main.rs:211:9:211:16 | MyStruct | main.rs:195:5:201:5 | struct MyStruct |
-| main.rs:216:5:216:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:216:5:216:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:216:5:216:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:216:5:216:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:216:5:216:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:217:5:217:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:217:5:217:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:218:5:218:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:218:5:218:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:218:5:218:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:218:5:218:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:219:5:219:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:220:5:220:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:221:5:221:9 | crate | main.rs:1:1:233:2 | SourceFile |
-| main.rs:221:5:221:12 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:222:5:222:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:222:5:222:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:222:5:222:13 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:223:5:223:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:223:5:223:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:223:5:223:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
-| main.rs:223:5:223:17 | ...::h | main.rs:30:27:34:13 | fn h |
-| main.rs:224:5:224:6 | m4 | main.rs:39:1:46:1 | mod m4 |
-| main.rs:224:5:224:9 | ...::i | main.rs:42:5:45:5 | fn i |
-| main.rs:225:5:225:5 | h | main.rs:50:1:69:1 | fn h |
-| main.rs:226:5:226:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:227:5:227:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:228:5:228:5 | j | main.rs:97:1:101:1 | fn j |
-| main.rs:229:5:229:6 | m6 | main.rs:109:1:120:1 | mod m6 |
-| main.rs:229:5:229:9 | ...::g | main.rs:114:5:119:5 | fn g |
-| main.rs:230:5:230:6 | m7 | main.rs:122:1:137:1 | mod m7 |
-| main.rs:230:5:230:9 | ...::f | main.rs:129:5:136:5 | fn f |
-| main.rs:231:5:231:6 | m8 | main.rs:139:1:182:1 | mod m8 |
-| main.rs:231:5:231:9 | ...::g | main.rs:169:5:181:5 | fn g |
-| main.rs:232:5:232:6 | m9 | main.rs:184:1:192:1 | mod m9 |
-| main.rs:232:5:232:9 | ...::f | main.rs:187:5:191:5 | fn f |
+| main.rs:221:17:221:19 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:221:17:221:19 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:222:9:222:11 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:222:9:222:11 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:231:9:231:11 | Bar | main.rs:227:5:229:5 | enum Bar |
+| main.rs:231:9:231:19 | ...::FooBar | main.rs:228:9:228:17 | FooBar |
+| main.rs:236:13:236:15 | Foo | main.rs:216:5:216:21 | struct Foo |
+| main.rs:236:13:236:15 | Foo | main.rs:218:5:218:15 | fn Foo |
+| main.rs:237:17:237:22 | FooBar | main.rs:228:9:228:17 | FooBar |
+| main.rs:237:17:237:22 | FooBar | main.rs:233:5:233:18 | fn FooBar |
+| main.rs:238:17:238:22 | FooBar | main.rs:228:9:228:17 | FooBar |
+| main.rs:238:17:238:22 | FooBar | main.rs:233:5:233:18 | fn FooBar |
+| main.rs:246:9:246:9 | E | main.rs:241:15:244:5 | enum E |
+| main.rs:246:9:246:12 | ...::C | main.rs:243:9:243:9 | C |
+| main.rs:249:17:249:17 | S | main.rs:241:5:241:13 | struct S |
+| main.rs:250:17:250:17 | C | main.rs:243:9:243:9 | C |
+| main.rs:264:14:264:17 | Self | main.rs:255:5:265:5 | trait MyParamTrait |
+| main.rs:273:13:273:17 | crate | main.rs:1:1:302:2 | SourceFile |
+| main.rs:273:13:273:22 | ...::m13 | main.rs:268:1:281:1 | mod m13 |
+| main.rs:273:13:273:25 | ...::f | main.rs:269:5:269:17 | fn f |
+| main.rs:273:13:273:25 | ...::f | main.rs:269:19:270:19 | struct f |
+| main.rs:276:17:276:17 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:276:17:276:17 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:277:21:277:21 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:277:21:277:21 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:278:13:278:13 | f | main.rs:269:5:269:17 | fn f |
+| main.rs:278:13:278:13 | f | main.rs:269:19:270:19 | struct f |
+| main.rs:284:5:284:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:284:5:284:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:284:5:284:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:284:5:284:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:284:5:284:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:285:5:285:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:285:5:285:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:286:5:286:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:286:5:286:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:286:5:286:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:286:5:286:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:287:5:287:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:288:5:288:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:289:5:289:9 | crate | main.rs:1:1:302:2 | SourceFile |
+| main.rs:289:5:289:12 | ...::h | main.rs:50:1:69:1 | fn h |
+| main.rs:290:5:290:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:290:5:290:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:290:5:290:13 | ...::g | main.rs:23:9:27:9 | fn g |
+| main.rs:291:5:291:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:291:5:291:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:291:5:291:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
+| main.rs:291:5:291:17 | ...::h | main.rs:30:27:34:13 | fn h |
+| main.rs:292:5:292:6 | m4 | main.rs:39:1:46:1 | mod m4 |
+| main.rs:292:5:292:9 | ...::i | main.rs:42:5:45:5 | fn i |
+| main.rs:293:5:293:5 | h | main.rs:50:1:69:1 | fn h |
+| main.rs:294:5:294:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:295:5:295:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:296:5:296:5 | j | main.rs:97:1:101:1 | fn j |
+| main.rs:297:5:297:6 | m6 | main.rs:109:1:120:1 | mod m6 |
+| main.rs:297:5:297:9 | ...::g | main.rs:114:5:119:5 | fn g |
+| main.rs:298:5:298:6 | m7 | main.rs:122:1:137:1 | mod m7 |
+| main.rs:298:5:298:9 | ...::f | main.rs:129:5:136:5 | fn f |
+| main.rs:299:5:299:6 | m8 | main.rs:139:1:182:1 | mod m8 |
+| main.rs:299:5:299:9 | ...::g | main.rs:169:5:181:5 | fn g |
+| main.rs:300:5:300:6 | m9 | main.rs:184:1:192:1 | mod m9 |
+| main.rs:300:5:300:9 | ...::f | main.rs:187:5:191:5 | fn f |
+| main.rs:301:5:301:7 | m11 | main.rs:215:1:252:1 | mod m11 |
+| main.rs:301:5:301:10 | ...::f | main.rs:220:5:223:5 | fn f |
+| main.rs:301:5:301:10 | ...::f | main.rs:225:5:225:12 | mod f |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |