Stop using String
for error codes.
Error codes are integers, but `String` is used everywhere to represent them. Gross! This commit introduces `ErrCode`, an integral newtype for error codes, replacing `String`. It also introduces a constant for every error code, e.g. `E0123`, and removes the `error_code!` macro. The constants are imported wherever used with `use rustc_errors::codes::*`. With the old code, we have three different ways to specify an error code at a use point: ``` error_code!(E0123) // macro call struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call \#[diag(name, code = "E0123")] // string struct Diag; ``` With the new code, they all use the `E0123` constant. ``` E0123 // constant struct_span_code_err!(dcx, span, E0123, "msg"); // constant \#[diag(name, code = E0123)] // constant struct Diag; ``` The commit also changes the structure of the error code definitions: - `rustc_error_codes` now just defines a higher-order macro listing the used error codes and nothing else. - Because that's now the only thing in the `rustc_error_codes` crate, I moved it into the `lib.rs` file and removed the `error_codes.rs` file. - `rustc_errors` uses that macro to define everything, e.g. the error code constants and the `DIAGNOSTIC_TABLES`. This is in its new `codes.rs` file.
This commit is contained in:
parent
0321de2778
commit
5d9dfbd08f
110 changed files with 1624 additions and 1572 deletions
|
@ -7,7 +7,7 @@ use rustc_ast::ast::{self, AttrStyle};
|
|||
use rustc_ast::token::{self, CommentKind, Delimiter, Token, TokenKind};
|
||||
use rustc_ast::tokenstream::TokenStream;
|
||||
use rustc_ast::util::unicode::contains_text_flow_control_chars;
|
||||
use rustc_errors::{error_code, Applicability, DiagCtxt, DiagnosticBuilder, StashKey};
|
||||
use rustc_errors::{codes::*, Applicability, DiagCtxt, DiagnosticBuilder, StashKey};
|
||||
use rustc_lexer::unescape::{self, EscapeError, Mode};
|
||||
use rustc_lexer::{Base, DocStyle, RawStrError};
|
||||
use rustc_lexer::{Cursor, LiteralKind};
|
||||
|
@ -397,7 +397,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
if !terminated {
|
||||
self.dcx()
|
||||
.struct_span_fatal(self.mk_sp(start, end), "unterminated character literal")
|
||||
.with_code(error_code!(E0762))
|
||||
.with_code(E0762)
|
||||
.emit()
|
||||
}
|
||||
self.cook_unicode(token::Char, Mode::Char, start, end, 1, 1) // ' '
|
||||
|
@ -409,7 +409,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
self.mk_sp(start + BytePos(1), end),
|
||||
"unterminated byte constant",
|
||||
)
|
||||
.with_code(error_code!(E0763))
|
||||
.with_code(E0763)
|
||||
.emit()
|
||||
}
|
||||
self.cook_unicode(token::Byte, Mode::Byte, start, end, 2, 1) // b' '
|
||||
|
@ -421,7 +421,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
self.mk_sp(start, end),
|
||||
"unterminated double quote string",
|
||||
)
|
||||
.with_code(error_code!(E0765))
|
||||
.with_code(E0765)
|
||||
.emit()
|
||||
}
|
||||
self.cook_unicode(token::Str, Mode::Str, start, end, 1, 1) // " "
|
||||
|
@ -433,7 +433,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
self.mk_sp(start + BytePos(1), end),
|
||||
"unterminated double quote byte string",
|
||||
)
|
||||
.with_code(error_code!(E0766))
|
||||
.with_code(E0766)
|
||||
.emit()
|
||||
}
|
||||
self.cook_unicode(token::ByteStr, Mode::ByteStr, start, end, 2, 1) // b" "
|
||||
|
@ -445,7 +445,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
self.mk_sp(start + BytePos(1), end),
|
||||
"unterminated C string",
|
||||
)
|
||||
.with_code(error_code!(E0767))
|
||||
.with_code(E0767)
|
||||
.emit()
|
||||
}
|
||||
self.cook_mixed(token::CStr, Mode::CStr, start, end, 2, 1) // c" "
|
||||
|
@ -582,7 +582,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
) -> ! {
|
||||
let mut err =
|
||||
self.dcx().struct_span_fatal(self.mk_sp(start, start), "unterminated raw string");
|
||||
err.code(error_code!(E0748));
|
||||
err.code(E0748);
|
||||
err.span_label(self.mk_sp(start, start), "unterminated raw string");
|
||||
|
||||
if n_hashes > 0 {
|
||||
|
@ -614,7 +614,7 @@ impl<'sess, 'src> StringReader<'sess, 'src> {
|
|||
};
|
||||
let last_bpos = self.pos;
|
||||
let mut err = self.dcx().struct_span_fatal(self.mk_sp(start, last_bpos), msg);
|
||||
err.code(error_code!(E0758));
|
||||
err.code(E0758);
|
||||
let mut nested_block_comment_open_idxs = vec![];
|
||||
let mut last_nested_block_comment_idxs = None;
|
||||
let mut content_chars = self.str_from(start).char_indices().peekable();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue