[gcc r16-2801] gccrs: Improve canonical path handling for impl items

[Arthur Cohen via Gcc-cvs]

https://gcc.gnu.org/g:f70757fb5914c2bb1794c4754df2f205618044d9

commit r16-2801-gf70757fb5914c2bb1794c4754df2f205618044d9
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date:   Fri May 2 20:28:15 2025 -0400

    gccrs: Improve canonical path handling for impl items
    
    gcc/rust/ChangeLog:
    
            * resolve/rust-ast-resolve-item.cc
            (ResolveItem::visit): Use the return values of
            CanonicalPath::inherent_impl_seg and
            CanonicalPath::trait_impl_projection_seg more directly.
            * util/rust-canonical-path.h
            (CanonicalPath::trait_impl_projection_seg): Append "<impl "
            instead of "<" to the beginning of the returned path segment.
            (CanonicalPath::inherent_impl_seg): Likewise.
    
    Signed-off-by: Owen Avery <powerboat9.ga...@gmail.com>

Diff:
---
 gcc/rust/resolve/rust-ast-resolve-item.cc | 13 ++-----------
 gcc/rust/util/rust-canonical-path.h       |  8 ++++++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc 
b/gcc/rust/resolve/rust-ast-resolve-item.cc
index 30f6d430b861..9f95f517187e 100644
--- a/gcc/rust/resolve/rust-ast-resolve-item.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-item.cc
@@ -608,10 +608,7 @@ ResolveItem::visit (AST::InherentImpl &impl_block)
     }
   else
     {
-      std::string seg_buf = "<impl " + self_cpath.get () + ">";
-      CanonicalPath seg
-       = CanonicalPath::new_seg (impl_block.get_node_id (), seg_buf);
-      cpath = canonical_prefix.append (seg);
+      cpath = canonical_prefix.append (impl_type_seg);
     }
 
   // done setup paths
@@ -732,13 +729,7 @@ ResolveItem::visit (AST::TraitImpl &impl_block)
     }
   else
     {
-      std::string projection_str = canonical_projection.get ();
-      std::string seg_buf
-       = "<impl " + projection_str.substr (1, projection_str.size () - 2)
-         + ">";
-      CanonicalPath seg
-       = CanonicalPath::new_seg (impl_block.get_node_id (), seg_buf);
-      cpath = canonical_prefix.append (seg);
+      cpath = canonical_prefix.append (canonical_projection);
     }
 
   // DONE setup canonical-path
diff --git a/gcc/rust/util/rust-canonical-path.h 
b/gcc/rust/util/rust-canonical-path.h
index 4d8f9542c8b1..ee37befb2e04 100644
--- a/gcc/rust/util/rust-canonical-path.h
+++ b/gcc/rust/util/rust-canonical-path.h
@@ -68,14 +68,18 @@ public:
   trait_impl_projection_seg (NodeId id, const CanonicalPath &trait_seg,
                             const CanonicalPath &impl_type_seg)
   {
-    return CanonicalPath::new_seg (id, "<" + impl_type_seg.get () + " as "
+    // https://doc.rust-lang.org/reference/paths.html#canonical-paths
+    // should be "<X>"?
+    return CanonicalPath::new_seg (id, "<impl " + impl_type_seg.get () + " as "
                                         + trait_seg.get () + ">");
   }
 
   static CanonicalPath inherent_impl_seg (NodeId id,
                                          const CanonicalPath &impl_type_seg)
   {
-    return CanonicalPath::new_seg (id, "<" + impl_type_seg.get () + ">");
+    // https://doc.rust-lang.org/reference/paths.html#canonical-paths
+    // should be "<X as Y>"?
+    return CanonicalPath::new_seg (id, "<impl " + impl_type_seg.get () + ">");
   }
 
   std::string get () const