Rust: Change canonical paths for trait items

Use `crate::Trait::foo` instead of `<_ as crate::Trait>::foo` for trait items.

Author: hvitved

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

@@ -1095,31 +1095,25 @@ final class TraitItemNode extends ImplOrTraitItemNode, NamedItemNode, TypeItemNo
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
-    result = "<_ as "
-    or
-    i = 1 and
     result = this.getCanonicalPathPrefix(c)
     or
-    i = 2 and
+    i = 1 and
     result = "::"
     or
-    i = 3 and
+    i = 2 and
     result = this.getName()
-    or
-    i = 4 and
-    result = ">"
   }
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
     this.hasCanonicalPath(c) and
-    result = strictconcat(int i | i in [1 .. 3] | this.getCanonicalPathPart(c, i) order by i)
+    result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 
   language[monotonicAggregates]
   override string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
     this.providesCanonicalPathPrefixFor(c, child) and
-    result = strictconcat(int i | i in [0 .. 4] | this.getCanonicalPathPart(c, i) order by i)
+    result = this.getCanonicalPath(c)
   }
 }
 

rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected

@@ -8,13 +8,13 @@
 | regular.rs:1:1:2:18 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
 | regular.rs:1:1:2:18 | struct Struct | test::regular::Struct |
 | regular.rs:4:1:6:1 | trait Trait | test::regular::Trait |
-| regular.rs:5:5:5:16 | fn f | <_ as test::regular::Trait>::f |
+| regular.rs:5:5:5:16 | fn f | test::regular::Trait::f |
 | regular.rs:8:1:10:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
 | regular.rs:9:5:9:18 | fn f | <test::regular::Struct as test::regular::Trait>::f |
 | regular.rs:12:1:14:1 | impl Struct { ... } | <test::regular::Struct> |
 | regular.rs:13:5:13:18 | fn g | <test::regular::Struct>::g |
 | regular.rs:16:1:18:1 | trait TraitWithBlanketImpl | test::regular::TraitWithBlanketImpl |
-| regular.rs:17:5:17:16 | fn h | <_ as test::regular::TraitWithBlanketImpl>::h |
+| regular.rs:17:5:17:16 | fn h | test::regular::TraitWithBlanketImpl::h |
 | regular.rs:24:1:24:12 | fn free | test::regular::free |
 | regular.rs:26:1:32:1 | fn usage | test::regular::usage |
 | regular.rs:34:1:38:1 | enum MyEnum | test::regular::MyEnum |
@@ -27,6 +27,6 @@
 | regular.rs:66:5:66:40 | fn is_alphanum | test::regular::is_alphanum |
 | regular.rs:69:1:71:1 | fn is_number_or_letter | test::regular::is_number_or_letter |
 | regular.rs:73:1:75:1 | trait Abs | test::regular::Abs |
-| regular.rs:74:5:74:25 | fn abs | <_ as test::regular::Abs>::abs |
+| regular.rs:74:5:74:25 | fn abs | test::regular::Abs::abs |
 | regular.rs:77:1:85:1 | impl Abs for i32 { ... } | <core::i32 as test::regular::Abs> |
 | regular.rs:78:5:84:5 | fn abs | <core::i32 as test::regular::Abs>::abs |