2021-01-02 18:45:11 +00:00
|
|
|
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::*,
|
|
|
|
};
|
|
|
|
|
2024-02-22 23:20:45 +00:00
|
|
|
use rustc_errors::{Diag, ErrCode};
|
2020-03-11 11:49:08 +00:00
|
|
|
use rustc_session::Session;
|
2018-01-23 02:07:35 +00:00
|
|
|
|
2024-02-29 05:56:24 +00:00
|
|
|
pub trait StructuredDiag<'tcx> {
|
2018-01-23 02:07:35 +00:00
|
|
|
fn session(&self) -> &Session;
|
|
|
|
|
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.
2024-01-13 23:57:07 +00:00
|
|
|
fn code(&self) -> ErrCode;
|
2018-01-23 02:07:35 +00:00
|
|
|
|
2024-02-22 23:20:45 +00:00
|
|
|
fn diagnostic(&self) -> Diag<'tcx> {
|
2021-01-02 18:45:11 +00:00
|
|
|
let err = self.diagnostic_common();
|
2018-01-23 02:07:35 +00:00
|
|
|
|
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.
2024-01-13 23:57:07 +00:00
|
|
|
if self.session().teach(self.code()) {
|
2021-01-02 18:45:11 +00:00
|
|
|
self.diagnostic_extended(err)
|
2018-01-23 02:07:35 +00:00
|
|
|
} else {
|
2021-01-02 18:45:11 +00:00
|
|
|
self.diagnostic_regular(err)
|
2018-01-23 02:07:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-22 23:20:45 +00:00
|
|
|
fn diagnostic_common(&self) -> Diag<'tcx>;
|
2018-01-23 02:07:35 +00:00
|
|
|
|
2024-02-22 23:20:45 +00:00
|
|
|
fn diagnostic_regular(&self, err: Diag<'tcx>) -> Diag<'tcx> {
|
2021-01-02 18:45:11 +00:00
|
|
|
err
|
2018-01-23 02:07:35 +00:00
|
|
|
}
|
|
|
|
|
2024-02-22 23:20:45 +00:00
|
|
|
fn diagnostic_extended(&self, err: Diag<'tcx>) -> Diag<'tcx> {
|
2018-01-23 02:07:35 +00:00
|
|
|
err
|
|
|
|
}
|
|
|
|
}
|