Update compiler/rustc_parse/src/parser/path.rs

Co-authored-by: León Orell Valerian Liehr <[email protected]>

Author: chenyukang

compiler/rustc_parse/src/parser/path.rs

@@ -246,23 +246,18 @@ impl<'a> Parser<'a> {
             segments.push(segment);
 
             if self.is_import_coupler() || !self.eat_path_sep() {
-                let ok_for_recovery = match style {
-                    PathStyle::Expr => self.may_recover(),
-                    PathStyle::Type => {
-                        self.may_recover()
-                            && if let Some((ident, _)) = self.prev_token.ident() {
-                                ident.as_str().chars().all(|c| c.is_lowercase())
-                                    && self.token == token::Colon
-                                    && self.token.span.lo() == self.prev_token.span.hi()
-                                    && self.look_ahead(1, |token| {
-                                        self.token.span.hi() == token.span.lo()
-                                    })
-                            } else {
-                                false
-                            }
-                    }
-                    _ => false,
-                };
+                let ok_for_recovery = self.may_recover()
+                    && match style {
+                        PathStyle::Expr => true,
+                        PathStyle::Type if let Some((ident, _)) = self.prev_token.ident() => {
+                            self.token == token::Colon
+                                && ident.as_str().chars().all(|c| c.is_lowercase())
+                                && self.token.span.lo() == self.prev_token.span.hi()
+                                && self
+                                    .look_ahead(1, |token| self.token.span.hi() == token.span.lo())
+                        }
+                        _ => false,
+                    };
                 if ok_for_recovery
                     && self.token == token::Colon
                     && self.look_ahead(1, |token| token.is_ident() && !token.is_reserved_ident())

tests/ui/suggestions/struct-field-type-including-single-colon.stderr

@@ -7,9 +7,8 @@ LL |     a: foo:A,
    = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 help: use a double colon instead
    |
-LL -     a: foo:A,
-LL +     a: foo::A,
-   |
+LL |     a: foo::A,
+   |            +
 
 error: path separator must be a double colon
   --> $DIR/struct-field-type-including-single-colon.rs:15:16
@@ -20,14 +19,8 @@ LL |     b: foo::bar:B,
    = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 help: use a double colon instead
    |
-<<<<<<< HEAD
-LL -     b: foo::bar:B,
-LL +     b: foo::bar::B,
-   |
-=======
 LL |     b: foo::bar::B,
    |                 +
->>>>>>> 949333b7f9a (Try to recover from path sep error in parser)
 
 error[E0603]: struct `A` is private
   --> $DIR/struct-field-type-including-single-colon.rs:9:12