Rust: Handle self enum/struct uses

Author: hvitved

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -181,7 +181,9 @@ abstract class ItemNode extends Locatable {
     else result = this.getImmediateParentModule().getImmediateParentModule()
     or
     name = "self" and
-    if this instanceof Module then result = this else result = this.getImmediateParentModule()
+    if this instanceof Module or this instanceof Enum or this instanceof Struct
+    then result = this
+    else result = this.getImmediateParentModule()
     or
     name = "Self" and
     this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()

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

@@ -505,17 +505,17 @@ mod m21 {
     mod m33 {
         #[rustfmt::skip]
         use super::m22::MyEnum::{ // $ item=I105
-            self // $ MISSING: item=I105 $ SPURIOUS: item=I107
+            self // $ item=I105
         };
 
         #[rustfmt::skip]
         use super::m22::MyStruct::{ // $ item=I106
-            self // $ MISSING: item=I106 $ SPURIOUS: item=I107
+            self // $ item=I106
         };
 
         fn f() {
             let _ = MyEnum::A; // $ MISSING: item=I104
-            let _ = MyStruct {}; // $ MISSING: item=I106
+            let _ = MyStruct {}; // $ item=I106
         }
     }
 }

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

@@ -226,11 +226,13 @@ resolvePath
 | main.rs:507:13:507:17 | super | main.rs:496:1:521:1 | mod m21 |
 | main.rs:507:13:507:22 | ...::m22 | main.rs:497:5:503:5 | mod m22 |
 | main.rs:507:13:507:30 | ...::MyEnum | main.rs:498:9:500:9 | enum MyEnum |
-| main.rs:508:13:508:16 | self | main.rs:497:5:503:5 | mod m22 |
+| main.rs:508:13:508:16 | self | main.rs:498:9:500:9 | enum MyEnum |
 | main.rs:512:13:512:17 | super | main.rs:496:1:521:1 | mod m21 |
 | main.rs:512:13:512:22 | ...::m22 | main.rs:497:5:503:5 | mod m22 |
 | main.rs:512:13:512:32 | ...::MyStruct | main.rs:502:9:502:28 | struct MyStruct |
-| main.rs:513:13:513:16 | self | main.rs:497:5:503:5 | mod m22 |
+| main.rs:513:13:513:16 | self | main.rs:502:9:502:28 | struct MyStruct |
+| main.rs:517:21:517:26 | MyEnum | main.rs:498:9:500:9 | enum MyEnum |
+| main.rs:518:21:518:28 | MyStruct | main.rs:502:9:502:28 | struct MyStruct |
 | main.rs:524:5:524:6 | my | main.rs:1:1:1:7 | mod my |
 | main.rs:524:5:524:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
 | main.rs:524:5:524:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |