mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-05 03:38:29 +00:00
5d9dfbd08f
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.
37 lines
940 B
Rust
37 lines
940 B
Rust
mod missing_cast_for_variadic_arg;
|
|
mod sized_unsized_cast;
|
|
mod wrong_number_of_generic_args;
|
|
|
|
pub use self::{
|
|
missing_cast_for_variadic_arg::*, sized_unsized_cast::*, wrong_number_of_generic_args::*,
|
|
};
|
|
|
|
use rustc_errors::{DiagnosticBuilder, ErrCode};
|
|
use rustc_session::Session;
|
|
|
|
pub trait StructuredDiagnostic<'tcx> {
|
|
fn session(&self) -> &Session;
|
|
|
|
fn code(&self) -> ErrCode;
|
|
|
|
fn diagnostic(&self) -> DiagnosticBuilder<'tcx> {
|
|
let err = self.diagnostic_common();
|
|
|
|
if self.session().teach(self.code()) {
|
|
self.diagnostic_extended(err)
|
|
} else {
|
|
self.diagnostic_regular(err)
|
|
}
|
|
}
|
|
|
|
fn diagnostic_common(&self) -> DiagnosticBuilder<'tcx>;
|
|
|
|
fn diagnostic_regular(&self, err: DiagnosticBuilder<'tcx>) -> DiagnosticBuilder<'tcx> {
|
|
err
|
|
}
|
|
|
|
fn diagnostic_extended(&self, err: DiagnosticBuilder<'tcx>) -> DiagnosticBuilder<'tcx> {
|
|
err
|
|
}
|
|
}
|