more updates on parser

Author: chenyukang

compiler/rustc_parse/src/errors.rs

@@ -1305,28 +1305,29 @@ impl<'a> IntoDiagnostic<'a> for ExpectedSemi {
     fn into_diagnostic(self, dcx: &'a DiagCtxt, level: Level) -> DiagnosticBuilder<'a> {
         let token_descr = TokenDescription::from_token(&self.token);
 
-        let mut diag = DiagnosticBuilder::new(
-            dcx,
-            level,
-            match token_descr {
-                Some(TokenDescription::ReservedIdentifier) => {
-                    fluent::parse_expected_semi_found_reserved_identifier_str
-                }
-                Some(TokenDescription::Keyword) => fluent::parse_expected_semi_found_keyword_str,
-                Some(TokenDescription::ReservedKeyword) => {
-                    fluent::parse_expected_semi_found_reserved_keyword_str
-                }
-                Some(TokenDescription::DocComment) => {
-                    fluent::parse_expected_semi_found_doc_comment_str
-                }
-                None => fluent::parse_expected_semi_found_str,
-            },
-        );
+        let mut diag = handler.struct_diagnostic(match token_descr {
+            Some(TokenDescription::ReservedIdentifier) => DiagnosticMessage::Str(Cow::from(
+                "expected `;`, found reserved identifier `{$token}`",
+            )),
+            Some(TokenDescription::Keyword) => {
+                DiagnosticMessage::Str(Cow::from("expected `;`, found keyword `{$token}`"))
+            }
+            Some(TokenDescription::ReservedKeyword) => {
+                DiagnosticMessage::Str(Cow::from("expected `;`, found reserved keyword `{$token}`"))
+            }
+            Some(TokenDescription::DocComment) => {
+                DiagnosticMessage::Str(Cow::from("expected `;`, found doc comment `{$token}`"))
+            }
+            None => DiagnosticMessage::Str(Cow::from("expected `;`, found `{$token}`")),
+        });
         diag.set_span(self.span);
         diag.set_arg("token", self.token);
 
         if let Some(unexpected_token_label) = self.unexpected_token_label {
-            diag.span_label(unexpected_token_label, fluent::parse_label_unexpected_token);
+            diag.span_label(
+                unexpected_token_label,
+                DiagnosticMessage::Str(Cow::from("unexpected token")),
+            );
         }
 
         self.sugg.add_to_diagnostic(&mut diag);