mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-19 11:07:32 +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.
23 lines
670 B
Rust
23 lines
670 B
Rust
use crate::ErrCode;
|
|
use rustc_data_structures::fx::FxHashMap;
|
|
|
|
#[derive(Debug)]
|
|
pub struct InvalidErrorCode;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Registry {
|
|
long_descriptions: FxHashMap<ErrCode, &'static str>,
|
|
}
|
|
|
|
impl Registry {
|
|
pub fn new(long_descriptions: &[(ErrCode, &'static str)]) -> Registry {
|
|
Registry { long_descriptions: long_descriptions.iter().copied().collect() }
|
|
}
|
|
|
|
/// Returns `InvalidErrorCode` if the code requested does not exist in the
|
|
/// registry.
|
|
pub fn try_find_description(&self, code: ErrCode) -> Result<&'static str, InvalidErrorCode> {
|
|
self.long_descriptions.get(&code).copied().ok_or(InvalidErrorCode)
|
|
}
|
|
}
|