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.
106 lines
2.8 KiB
Rust
106 lines
2.8 KiB
Rust
use rustc_errors::{codes::*, DiagnosticArgFromDisplay};
|
|
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
|
|
use rustc_span::{Span, Symbol};
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(privacy_field_is_private, code = E0451)]
|
|
pub struct FieldIsPrivate {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
pub field_name: Symbol,
|
|
pub variant_descr: &'static str,
|
|
pub def_path_str: String,
|
|
#[subdiagnostic]
|
|
pub label: FieldIsPrivateLabel,
|
|
}
|
|
|
|
#[derive(Subdiagnostic)]
|
|
pub enum FieldIsPrivateLabel {
|
|
#[label(privacy_field_is_private_is_update_syntax_label)]
|
|
IsUpdateSyntax {
|
|
#[primary_span]
|
|
span: Span,
|
|
field_name: Symbol,
|
|
},
|
|
#[label(privacy_field_is_private_label)]
|
|
Other {
|
|
#[primary_span]
|
|
span: Span,
|
|
},
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(privacy_item_is_private)]
|
|
pub struct ItemIsPrivate<'a> {
|
|
#[primary_span]
|
|
#[label]
|
|
pub span: Span,
|
|
pub kind: &'a str,
|
|
pub descr: DiagnosticArgFromDisplay<'a>,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(privacy_unnamed_item_is_private)]
|
|
pub struct UnnamedItemIsPrivate {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
pub kind: &'static str,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(privacy_in_public_interface, code = E0446)]
|
|
pub struct InPublicInterface<'a> {
|
|
#[primary_span]
|
|
#[label]
|
|
pub span: Span,
|
|
pub vis_descr: &'static str,
|
|
pub kind: &'a str,
|
|
pub descr: DiagnosticArgFromDisplay<'a>,
|
|
#[label(privacy_visibility_label)]
|
|
pub vis_span: Span,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(privacy_report_effective_visibility)]
|
|
pub struct ReportEffectiveVisibility {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
pub descr: String,
|
|
}
|
|
|
|
#[derive(LintDiagnostic)]
|
|
#[diag(privacy_from_private_dep_in_public_interface)]
|
|
pub struct FromPrivateDependencyInPublicInterface<'a> {
|
|
pub kind: &'a str,
|
|
pub descr: DiagnosticArgFromDisplay<'a>,
|
|
pub krate: Symbol,
|
|
}
|
|
|
|
#[derive(LintDiagnostic)]
|
|
#[diag(privacy_unnameable_types_lint)]
|
|
pub struct UnnameableTypesLint<'a> {
|
|
#[label]
|
|
pub span: Span,
|
|
pub kind: &'a str,
|
|
pub descr: DiagnosticArgFromDisplay<'a>,
|
|
pub reachable_vis: &'a str,
|
|
pub reexported_vis: &'a str,
|
|
}
|
|
|
|
// Used for `private_interfaces` and `private_bounds` lints.
|
|
// They will replace private-in-public errors and compatibility lints in future.
|
|
// See https://rust-lang.github.io/rfcs/2145-type-privacy.html for more details.
|
|
#[derive(LintDiagnostic)]
|
|
#[diag(privacy_private_interface_or_bounds_lint)]
|
|
pub struct PrivateInterfacesOrBoundsLint<'a> {
|
|
#[label(privacy_item_label)]
|
|
pub item_span: Span,
|
|
pub item_kind: &'a str,
|
|
pub item_descr: DiagnosticArgFromDisplay<'a>,
|
|
pub item_vis_descr: &'a str,
|
|
#[note(privacy_ty_note)]
|
|
pub ty_span: Span,
|
|
pub ty_kind: &'a str,
|
|
pub ty_descr: DiagnosticArgFromDisplay<'a>,
|
|
pub ty_vis_descr: &'a str,
|
|
}
|