Rust: Add path resolution tests

Author: hvitved

rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll

@@ -25,10 +25,14 @@ private module ResolveTest implements TestSig {
 
   private predicate item(ItemNode i, string value) {
     exists(string filepath, int line, boolean inMacro | itemAt(i, filepath, line, inMacro) |
-      commmentAt(value, filepath, line) and inMacro = false
-      or
-      not (commmentAt(_, filepath, line) and inMacro = false) and
-      value = i.getName()
+      if i instanceof SourceFile
+      then value = i.getFile().getBaseName()
+      else (
+        commmentAt(value, filepath, line) and inMacro = false
+        or
+        not (commmentAt(_, filepath, line) and inMacro = false) and
+        value = i.getName()
+      )
     )
   }
 

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

@@ -15,6 +15,8 @@ pub use nested2::nested7::nested8::{ // $ item=I118
 
 use nested2::nested5::nested6::f as nested6_f; // $ item=I116
 
+use std::ops::Deref; // $ item=Deref
+
 pub mod my3;
 
 #[path = "renamed.rs"]

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

@@ -8,3 +8,7 @@ use super::super::h; // $ item=I25
 use super::g; // $ item=I9
 
 use super::nested6_f; // $ item=I116
+
+use super::*; // $ item=mod.rs
+
+trait MyTrait: Deref {} // $ MISSING: item=Deref

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

@@ -32,8 +32,8 @@ mod
 | main.rs:627:1:695:1 | mod m24 |
 | main.rs:712:1:764:1 | mod associated_types |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| my2/mod.rs:18:1:18:12 | mod my3 |
-| my2/mod.rs:20:1:21:10 | mod mymod |
+| my2/mod.rs:20:1:20:12 | mod my3 |
+| my2/mod.rs:22:1:23:10 | mod mymod |
 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | my2/nested2.rs:13:1:19:1 | mod nested5 |
@@ -399,7 +399,7 @@ resolvePath
 | main.rs:793:5:793:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
 | main.rs:794:5:794:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
 | main.rs:794:5:794:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:795:5:795:7 | my3 | my2/mod.rs:18:1:18:12 | mod my3 |
+| main.rs:795:5:795:7 | my3 | my2/mod.rs:20:1:20:12 | mod my3 |
 | main.rs:795:5:795:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
 | main.rs:796:5:796:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
 | main.rs:797:5:797:7 | m18 | main.rs:553:1:571:1 | mod m18 |
@@ -429,17 +429,21 @@ resolvePath
 | my2/mod.rs:16:5:16:20 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
 | my2/mod.rs:16:5:16:29 | ...::nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
 | my2/mod.rs:16:5:16:32 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| my2/mod.rs:23:9:23:13 | mymod | my2/mod.rs:20:1:21:10 | mod mymod |
-| my2/mod.rs:23:9:23:16 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
+| my2/mod.rs:18:5:18:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| my2/mod.rs:18:5:18:12 | ...::ops | {EXTERNAL LOCATION} | mod ops |
+| my2/mod.rs:18:5:18:19 | ...::Deref | {EXTERNAL LOCATION} | trait Deref |
+| my2/mod.rs:25:9:25:13 | mymod | my2/mod.rs:22:1:23:10 | mod mymod |
+| my2/mod.rs:25:9:25:16 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
 | my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
 | my2/my3/mod.rs:4:5:4:5 | h | main.rs:56:1:75:1 | fn h |
-| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
+| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:805:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:56:1:75:1 | fn h |
-| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
+| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
-| my2/my3/mod.rs:10:5:10:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
+| my2/my3/mod.rs:10:5:10:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my2/my3/mod.rs:10:5:10:20 | ...::nested6_f | my2/nested2.rs:15:9:17:9 | fn f |
+| my2/my3/mod.rs:12:5:12:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my.rs:3:5:3:10 | nested | my.rs:1:1:1:15 | mod nested |
 | my.rs:3:5:3:13 | ...::g | my/nested.rs:19:1:22:1 | fn g |
 | my.rs:11:5:11:5 | g | my/nested.rs:19:1:22:1 | fn g |