bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Implement IntoDiagnosticArg for rustc_ast::token::Token(Kind)

Browse source
This commit is contained in:
Xiretza 2022-09-22 18:39:17 +02:00
parent 37fdcb4b36
commit d7c64574e0
7 changed files with 73 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

53
compiler/rustc_parse/src/errors.rs
View file

@ -1,3 +1,4 @@
use rustc_ast::token::Token;
use rustc_ast::Path;
use rustc_errors::{fluent, AddToDiagnostic, Applicability, EmissionGuarantee, IntoDiagnostic};
use rustc_macros::{Diagnostic, Subdiagnostic};
@ -5,7 +6,7 @@ use rustc_session::errors::ExprParenthesesNeeded;
use rustc_span::symbol::Ident;
use rustc_span::{Span, Symbol};
use crate::parser::{TokenDescription, TokenDescriptionKind};
use crate::parser::TokenDescription;
#[derive(Diagnostic)]
#[diag(parser::maybe_report_ambiguous_plus)]
@ -572,7 +573,7 @@ pub(crate) struct FoundExprWouldBeStmt {
#[primary_span]
#[label]
pub span: Span,
pub token: String,
pub token: Token,
#[subdiagnostic]
pub suggestion: ExprParenthesesNeeded,
}
@ -871,7 +872,7 @@ pub(crate) struct SuffixedLiteralInAttribute {
pub(crate) struct InvalidMetaItem {
#[primary_span]
pub span: Span,
pub token: String,
pub token: Token,
}
#[derive(Subdiagnostic)]
@ -908,14 +909,14 @@ pub(crate) enum ExpectedIdentifierFound {
}
impl ExpectedIdentifierFound {
pub fn new(token_descr_kind: Option<TokenDescriptionKind>, span: Span) -> Self {
(match token_descr_kind {
Some(TokenDescriptionKind::ReservedIdentifier) => {
pub fn new(token_descr: Option<TokenDescription>, span: Span) -> Self {
(match token_descr {
Some(TokenDescription::ReservedIdentifier) => {
ExpectedIdentifierFound::ReservedIdentifier
}
Some(TokenDescriptionKind::Keyword) => ExpectedIdentifierFound::Keyword,
Some(TokenDescriptionKind::ReservedKeyword) => ExpectedIdentifierFound::ReservedKeyword,
Some(TokenDescriptionKind::DocComment) => ExpectedIdentifierFound::DocComment,
Some(TokenDescription::Keyword) => ExpectedIdentifierFound::Keyword,
Some(TokenDescription::ReservedKeyword) => ExpectedIdentifierFound::ReservedKeyword,
Some(TokenDescription::DocComment) => ExpectedIdentifierFound::DocComment,
None => ExpectedIdentifierFound::Other,
})(span)
}
@ -923,7 +924,7 @@ impl ExpectedIdentifierFound {
pub(crate) struct ExpectedIdentifier {
pub span: Span,
pub token_descr: TokenDescription,
pub token: Token,
pub suggest_raw: Option<SuggEscapeToUseAsIdentifier>,
pub suggest_remove_comma: Option<SuggRemoveComma>,
}
@ -933,29 +934,31 @@ impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for ExpectedIdentifier {
self,
handler: &'a rustc_errors::Handler,
) -> rustc_errors::DiagnosticBuilder<'a, G> {
let mut diag = handler.struct_diagnostic(match self.token_descr.kind {
Some(TokenDescriptionKind::ReservedIdentifier) => {
let token_descr = super::parser::TokenDescription::from_token(&self.token);
let mut diag = handler.struct_diagnostic(match token_descr {
Some(TokenDescription::ReservedIdentifier) => {
fluent::parser::expected_identifier_found_reserved_identifier_str
}
Some(TokenDescriptionKind::Keyword) => {
Some(TokenDescription::Keyword) => {
fluent::parser::expected_identifier_found_keyword_str
}
Some(TokenDescriptionKind::ReservedKeyword) => {
Some(TokenDescription::ReservedKeyword) => {
fluent::parser::expected_identifier_found_reserved_keyword_str
}
Some(TokenDescriptionKind::DocComment) => {
Some(TokenDescription::DocComment) => {
fluent::parser::expected_identifier_found_doc_comment_str
}
None => fluent::parser::expected_identifier_found_str,
});
diag.set_span(self.span);
diag.set_arg("token_str", self.token_descr.name);
diag.set_arg("token", self.token);
if let Some(sugg) = self.suggest_raw {
sugg.add_to_diagnostic(&mut diag);
}
ExpectedIdentifierFound::new(self.token_descr.kind, self.span).add_to_diagnostic(&mut diag);
ExpectedIdentifierFound::new(token_descr, self.span).add_to_diagnostic(&mut diag);
if let Some(sugg) = self.suggest_remove_comma {
sugg.add_to_diagnostic(&mut diag);
@ -967,7 +970,7 @@ impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for ExpectedIdentifier {
pub(crate) struct ExpectedSemi {
pub span: Span,
pub token_descr: TokenDescription,
pub token: Token,
pub unexpected_token_label: Option<Span>,
pub sugg: ExpectedSemiSugg,
@ -978,21 +981,23 @@ impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for ExpectedSemi {
self,
handler: &'a rustc_errors::Handler,
) -> rustc_errors::DiagnosticBuilder<'a, G> {
let mut diag = handler.struct_diagnostic(match self.token_descr.kind {
Some(TokenDescriptionKind::ReservedIdentifier) => {
let token_descr = super::parser::TokenDescription::from_token(&self.token);
let mut diag = handler.struct_diagnostic(match token_descr {
Some(TokenDescription::ReservedIdentifier) => {
fluent::parser::expected_semi_found_reserved_identifier_str
}
Some(TokenDescriptionKind::Keyword) => fluent::parser::expected_semi_found_keyword_str,
Some(TokenDescriptionKind::ReservedKeyword) => {
Some(TokenDescription::Keyword) => fluent::parser::expected_semi_found_keyword_str,
Some(TokenDescription::ReservedKeyword) => {
fluent::parser::expected_semi_found_reserved_keyword_str
}
Some(TokenDescriptionKind::DocComment) => {
Some(TokenDescription::DocComment) => {
fluent::parser::expected_semi_found_doc_comment_str
}
None => fluent::parser::expected_semi_found_str,
});
diag.set_span(self.span);
diag.set_arg("token_str", self.token_descr.name);
diag.set_arg("token", self.token);
if let Some(unexpected_token_label) = self.unexpected_token_label {
diag.span_label(unexpected_token_label, fluent::parser::label_unexpected_token);

4
compiler/rustc_parse/src/parser/attr.rs
View file

@ -4,7 +4,6 @@ use super::{AttrWrapper, Capturing, FnParseMode, ForceCollect, Parser, PathStyle
use rustc_ast as ast;
use rustc_ast::attr;
use rustc_ast::token::{self, Delimiter, Nonterminal};
use rustc_ast_pretty::pprust;
use rustc_errors::{error_code, fluent, Diagnostic, IntoDiagnostic, PResult};
use rustc_span::{sym, BytePos, Span};
use std::convert::TryInto;
@ -414,8 +413,7 @@ impl<'a> Parser<'a> {
Err(err) => err.cancel(),
}
let token = pprust::token_to_string(&self.token).to_string();
Err(InvalidMetaItem { span: self.token.span, token }
Err(InvalidMetaItem { span: self.token.span, token: self.token.clone() }
.into_diagnostic(&self.sess.span_diagnostic))
}
}

6
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -326,7 +326,7 @@ impl<'a> Parser<'a> {
let err = ExpectedIdentifier {
span: self.token.span,
token_descr: super::token_descr_struct(&self.token),
token: self.token.clone(),
suggest_raw,
suggest_remove_comma,
};
@ -426,7 +426,7 @@ impl<'a> Parser<'a> {
// let y = 42;
self.sess.emit_err(ExpectedSemi {
span: self.token.span,
token_descr: super::token_descr_struct(&self.token),
token: self.token.clone(),
unexpected_token_label: None,
sugg: ExpectedSemiSugg::ChangeToSemi(self.token.span),
});
@ -451,7 +451,7 @@ impl<'a> Parser<'a> {
let span = self.prev_token.span.shrink_to_hi();
self.sess.emit_err(ExpectedSemi {
span,
token_descr: super::token_descr_struct(&self.token),
token: self.token.clone(),
unexpected_token_label: Some(self.token.span),
sugg: ExpectedSemiSugg::AddSemi(span),
});

3
compiler/rustc_parse/src/parser/expr.rs
View file

@ -430,8 +430,7 @@ impl<'a> Parser<'a> {
fn error_found_expr_would_be_stmt(&self, lhs: &Expr) {
self.sess.emit_err(FoundExprWouldBeStmt {
span: self.token.span,
// FIXME(#100717)
token: pprust::token_to_string(&self.token).to_string(),
token: self.token.clone(),
suggestion: ExprParenthesesNeeded::surrounding(lhs.span),
});
}

41
compiler/rustc_parse/src/parser/mod.rs
View file

@ -411,40 +411,33 @@ pub enum FollowedByType {
}
#[derive(Clone, Copy, PartialEq, Eq)]
pub enum TokenDescriptionKind {
pub enum TokenDescription {
ReservedIdentifier,
Keyword,
ReservedKeyword,
DocComment,
}
#[derive(Clone, PartialEq, Eq)]
pub struct TokenDescription {
pub kind: Option<TokenDescriptionKind>,
pub name: String,
}
pub(super) fn token_descr_struct(token: &Token) -> TokenDescription {
let kind = match token.kind {
_ if token.is_special_ident() => Some(TokenDescriptionKind::ReservedIdentifier),
_ if token.is_used_keyword() => Some(TokenDescriptionKind::Keyword),
_ if token.is_unused_keyword() => Some(TokenDescriptionKind::ReservedKeyword),
token::DocComment(..) => Some(TokenDescriptionKind::DocComment),
_ => None,
};
let name = pprust::token_to_string(token).to_string();
TokenDescription { kind, name }
impl TokenDescription {
pub fn from_token(token: &Token) -> Option<Self> {
match token.kind {
_ if token.is_special_ident() => Some(TokenDescription::ReservedIdentifier),
_ if token.is_used_keyword() => Some(TokenDescription::Keyword),
_ if token.is_unused_keyword() => Some(TokenDescription::ReservedKeyword),
token::DocComment(..) => Some(TokenDescription::DocComment),
_ => None,
}
}
}
pub(super) fn token_descr(token: &Token) -> String {
let TokenDescription { kind, name } = token_descr_struct(token);
let name = pprust::token_to_string(token).to_string();
let kind = kind.map(|kind| match kind {
TokenDescriptionKind::ReservedIdentifier => "reserved identifier",
TokenDescriptionKind::Keyword => "keyword",
TokenDescriptionKind::ReservedKeyword => "reserved keyword",
TokenDescriptionKind::DocComment => "doc comment",
let kind = TokenDescription::from_token(token).map(|kind| match kind {
TokenDescription::ReservedIdentifier => "reserved identifier",
TokenDescription::Keyword => "keyword",
TokenDescription::ReservedKeyword => "reserved keyword",
TokenDescription::DocComment => "doc comment",
});
if let Some(kind) = kind { format!("{} `{}`", kind, name) } else { format!("`{}`", name) }