Merge #651

651: Qualified paths have a mandatory initial segment r=philberty a=philberty

see https://doc.rust-lang.org/reference/paths.html#qualified-paths

The initial segment is mandatory this changes the AST to reflect this
it simplifies error handling down the line.

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 8ee9e42..1c0644d 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -6742,10 +6742,6 @@ Parser<ManagedTokenSource>::parse_qualified_path_in_type ()
       return AST::QualifiedPathInType::create_error ();
     }
 
-  // parse path segments
-  std::vector<std::unique_ptr<AST::TypePathSegment>> segments;
-  segments.reserve (1);
-
   // parse initial required segment
   if (!expect_token (SCOPE_RESOLUTION))
     {
@@ -6765,9 +6761,9 @@ Parser<ManagedTokenSource>::parse_qualified_path_in_type ()
 
       return AST::QualifiedPathInType::create_error ();
     }
-  segments.push_back (std::move (initial_segment));
 
   // parse optional segments (as long as scope resolution operator exists)
+  std::vector<std::unique_ptr<AST::TypePathSegment>> segments;
   const_TokenPtr t = lexer.peek_token ();
   while (t->get_id () == SCOPE_RESOLUTION)
     {
@@ -6796,6 +6792,7 @@ Parser<ManagedTokenSource>::parse_qualified_path_in_type ()
   segments.shrink_to_fit ();
 
   return AST::QualifiedPathInType (std::move (qual_path_type),
+				   std::move (initial_segment),
 				   std::move (segments), locus);
 }