-use rustc_errors::AddSubdiagnostic;
+use rustc_errors::AddToDiagnostic;
+use rustc_macros::{Diagnostic, Subdiagnostic};
use rustc_session::Limit;
use rustc_span::{Span, Symbol};
pub desc: String,
}
-impl AddSubdiagnostic for CycleStack {
+impl AddToDiagnostic for CycleStack {
fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) {
diag.span_note(self.span, &format!("...which requires {}...", self.desc));
}
DelayBug,
}
-#[derive(SessionSubdiagnostic)]
+#[derive(Subdiagnostic)]
pub enum StackCount {
#[note(query_system::cycle_stack_single)]
Single,
Multiple,
}
-#[derive(SessionSubdiagnostic)]
+#[derive(Subdiagnostic)]
pub enum Alias {
#[note(query_system::cycle_recursive_ty_alias)]
#[help(query_system::cycle_recursive_ty_alias_help1)]
Trait,
}
-#[derive(SessionSubdiagnostic)]
+#[derive(Subdiagnostic)]
#[note(query_system::cycle_usage)]
pub struct CycleUsage {
#[primary_span]
pub usage: String,
}
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
#[diag(query_system::cycle, code = "E0391")]
pub struct Cycle {
#[primary_span]
pub cycle_usage: Option<CycleUsage>,
}
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
#[diag(query_system::reentrant)]
pub struct Reentrant;
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
#[diag(query_system::increment_compilation)]
#[help]
#[note(query_system::increment_compilation_note1)]
pub dep_node: String,
}
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
#[help]
#[diag(query_system::query_overflow)]
pub struct QueryOverflow {
pub crate_name: Symbol,
}
-#[derive(SessionSubdiagnostic)]
+#[derive(Subdiagnostic)]
#[note(query_system::layout_of_depth)]
pub struct LayoutOfDepth {
pub desc: String,