--wip-- [skip ci]

Author: spanishpear

compiler/rustc_parse/src/errors.rs

@@ -890,7 +890,6 @@ pub(crate) struct SuggMisplacedGeneric {
     pub span: Span,
 }
 
-
 #[derive(Subdiagnostic)]
 pub(crate) enum ExpectedIdentifierFound {
     #[label(parser_expected_identifier_found_reserved_identifier)]

compiler/rustc_parse/src/parser/diagnostics.rs

@@ -12,9 +12,9 @@ use crate::errors::{
     IncorrectAwait, IncorrectSemicolon, IncorrectUseOfAwait, ParenthesesInForHead,
     ParenthesesInForHeadSugg, PatternMethodParamWithoutBody, QuestionMarkInType,
     QuestionMarkInTypeSugg, SelfParamNotFirst, StructLiteralBodyWithoutPath,
-    StructLiteralBodyWithoutPathSugg, SuggEscapeToUseAsIdentifier, SuggRemoveComma,
-    UnexpectedConstInGenericParam, UnexpectedConstParamDeclaration,
-    UnexpectedConstParamDeclarationSugg, UnmatchedAngleBrackets, UseEqInstead, SuggMisplacedGeneric,
+    StructLiteralBodyWithoutPathSugg, SuggEscapeToUseAsIdentifier, SuggMisplacedGeneric,
+    SuggRemoveComma, UnexpectedConstInGenericParam, UnexpectedConstParamDeclaration,
+    UnexpectedConstParamDeclarationSugg, UnmatchedAngleBrackets, UseEqInstead,
 };
 
 use crate::lexer::UnmatchedBrace;
@@ -328,35 +328,22 @@ impl<'a> Parser<'a> {
 
         let span = self.token.span;
         let token = self.token.clone();
-        let suggest_misplaced_generic = 
-            if self.token == token::Lt  {
-                // store the span before the generic calculation starts
-                if self.parse_generics().is_ok() {
-                    // FIXME: need the span of the whole generic. 
-                    Some(
-                        SuggMisplacedGeneric {
-                            span: span.until(self.token.span)
-                        }
-                    )
-                } else {
-                    None
-                }
+        let suggest_misplaced_generic = if self.token == token::Lt {
+            // store the span before the generic calculation starts
+            if self.parse_generics().is_ok() {
+                // FIXME: need the span of the whole generic.
+                Some(SuggMisplacedGeneric { span: span.until(self.token.span) })
             } else {
                 None
-            };
+            }
+        } else {
+            None
+        };
 
         // FIXME: write better rust
         let err = ExpectedIdentifier {
-            span: if suggest_misplaced_generic.is_some() {
-                span
-            }  else {
-                self.token.span
-            },
-            token: if suggest_misplaced_generic.is_some() {
-                token
-            }  else {
-                self.token.clone()
-            },
+            span: if suggest_misplaced_generic.is_some() { span } else { self.token.span },
+            token: if suggest_misplaced_generic.is_some() { token } else { self.token.clone() },
             suggest_raw,
             suggest_remove_comma,
             suggest_misplaced_generic,

compiler/rustc_parse/src/parser/mod.rs

@@ -540,10 +540,10 @@ impl<'a> Parser<'a> {
         self.parse_ident_common(true)
     }
 
-    fn ident_or_err(&mut self) -> PResult<'a, (Ident, /* is_raw */ bool)> {    
+    fn ident_or_err(&mut self) -> PResult<'a, (Ident, /* is_raw */ bool)> {
         debug!("fn ident_or_err");
         debug!(?self.token);
-        debug!(prev = ?self.prev_token);    
+        debug!(prev = ?self.prev_token);
         self.token.ident().ok_or_else(|| match self.prev_token.kind {
             TokenKind::DocComment(..) => DocCommentDoesNotDocumentAnything {
                 span: self.prev_token.span,
@@ -553,7 +553,7 @@ impl<'a> Parser<'a> {
             _ => self.expected_ident_found(),
         })
     }
-    
+
     // SHREYS - exits after ident_or_err()?
     fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, Ident> {
         let (ident, is_raw) = self.ident_or_err()?;