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.
155 lines
3.5 KiB
Rust
155 lines
3.5 KiB
Rust
use std::borrow::Cow;
|
|
use std::fmt;
|
|
|
|
use rustc_errors::{codes::*, DiagnosticArgValue, DiagnosticMessage};
|
|
use rustc_macros::Diagnostic;
|
|
use rustc_span::{Span, Symbol};
|
|
|
|
use crate::ty::Ty;
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_drop_check_overflow, code = E0320)]
|
|
#[note]
|
|
pub struct DropCheckOverflow<'tcx> {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
pub ty: Ty<'tcx>,
|
|
pub overflow_ty: Ty<'tcx>,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_opaque_hidden_type_mismatch)]
|
|
pub struct OpaqueHiddenTypeMismatch<'tcx> {
|
|
pub self_ty: Ty<'tcx>,
|
|
pub other_ty: Ty<'tcx>,
|
|
#[primary_span]
|
|
#[label]
|
|
pub other_span: Span,
|
|
#[subdiagnostic]
|
|
pub sub: TypeMismatchReason,
|
|
}
|
|
|
|
#[derive(Subdiagnostic)]
|
|
pub enum TypeMismatchReason {
|
|
#[label(middle_conflict_types)]
|
|
ConflictType {
|
|
#[primary_span]
|
|
span: Span,
|
|
},
|
|
#[note(middle_previous_use_here)]
|
|
PreviousUse {
|
|
#[primary_span]
|
|
span: Span,
|
|
},
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_limit_invalid)]
|
|
pub struct LimitInvalid<'a> {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
#[label]
|
|
pub value_span: Span,
|
|
pub error_str: &'a str,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_recursion_limit_reached)]
|
|
#[help]
|
|
pub struct RecursionLimitReached<'tcx> {
|
|
pub ty: Ty<'tcx>,
|
|
pub suggested_limit: rustc_session::Limit,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_const_eval_non_int)]
|
|
pub struct ConstEvalNonIntError {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_strict_coherence_needs_negative_coherence)]
|
|
pub(crate) struct StrictCoherenceNeedsNegativeCoherence {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
#[label]
|
|
pub attr_span: Option<Span>,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_requires_lang_item)]
|
|
pub(crate) struct RequiresLangItem {
|
|
#[primary_span]
|
|
pub span: Option<Span>,
|
|
pub name: Symbol,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_const_not_used_in_type_alias)]
|
|
pub(super) struct ConstNotUsedTraitAlias {
|
|
pub ct: String,
|
|
#[primary_span]
|
|
pub span: Span,
|
|
}
|
|
|
|
pub struct CustomSubdiagnostic<'a> {
|
|
pub msg: fn() -> DiagnosticMessage,
|
|
pub add_args:
|
|
Box<dyn FnOnce(&mut dyn FnMut(Cow<'static, str>, DiagnosticArgValue<'static>)) + 'a>,
|
|
}
|
|
|
|
impl<'a> CustomSubdiagnostic<'a> {
|
|
pub fn label(x: fn() -> DiagnosticMessage) -> Self {
|
|
Self::label_and_then(x, |_| {})
|
|
}
|
|
pub fn label_and_then<
|
|
F: FnOnce(&mut dyn FnMut(Cow<'static, str>, DiagnosticArgValue<'static>)) + 'a,
|
|
>(
|
|
msg: fn() -> DiagnosticMessage,
|
|
f: F,
|
|
) -> Self {
|
|
Self { msg, add_args: Box::new(move |x| f(x)) }
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for CustomSubdiagnostic<'_> {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
f.debug_struct("CustomSubdiagnostic").finish_non_exhaustive()
|
|
}
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
pub enum LayoutError<'tcx> {
|
|
#[diag(middle_unknown_layout)]
|
|
Unknown { ty: Ty<'tcx> },
|
|
|
|
#[diag(middle_values_too_big)]
|
|
Overflow { ty: Ty<'tcx> },
|
|
|
|
#[diag(middle_cannot_be_normalized)]
|
|
NormalizationFailure { ty: Ty<'tcx>, failure_ty: String },
|
|
|
|
#[diag(middle_cycle)]
|
|
Cycle,
|
|
|
|
#[diag(middle_layout_references_error)]
|
|
ReferencesError,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_adjust_for_foreign_abi_error)]
|
|
pub struct UnsupportedFnAbi {
|
|
pub arch: Symbol,
|
|
pub abi: &'static str,
|
|
}
|
|
|
|
#[derive(Diagnostic)]
|
|
#[diag(middle_erroneous_constant)]
|
|
pub struct ErroneousConstant {
|
|
#[primary_span]
|
|
pub span: Span,
|
|
}
|
|
|
|
/// Used by `rustc_const_eval`
|
|
pub use crate::fluent_generated::middle_adjust_for_foreign_abi_error;
|