Fix rebase mistake

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -13,14 +13,14 @@ use rustc_ast::walk_list;
 use rustc_ast::*;
 use rustc_ast_pretty::pprust::{self, State};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::fluent;
+use rustc_errors::{fluent, IntoDiagnostic};
 use rustc_macros::Subdiagnostic;
 use rustc_parse::validate_attr;
 use rustc_session::lint::builtin::{
     DEPRECATED_WHERE_CLAUSE_LOCATION, MISSING_ABI, PATTERNS_IN_FNS_WITHOUT_BODY,
 };
 use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
-use rustc_session::{Session, SessionDiagnostic};
+use rustc_session::Session;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym, Ident};
 use rustc_span::Span;
@@ -399,7 +399,7 @@ impl<'a> AstValidator<'a> {
 
     fn check_type_no_bounds<D>(&self, bounds: &[GenericBound], create_diag: impl FnOnce(Span) -> D)
     where
-        D: SessionDiagnostic<'a>,
+        D: IntoDiagnostic<'a>,
     {
         let span = match bounds {
             [] => return,
@@ -431,7 +431,7 @@ impl<'a> AstValidator<'a> {
         create_diag: impl FnOnce(Span, Span, Span) -> D,
         body: Option<Span>,
     ) where
-        D: SessionDiagnostic<'a>,
+        D: IntoDiagnostic<'a>,
     {
         let Some(body) = body else {
             return;
@@ -502,7 +502,7 @@ impl<'a> AstValidator<'a> {
 
     fn check_item_named<D>(&self, ident: Ident, create_diag: impl FnOnce(Span) -> D)
     where
-        D: SessionDiagnostic<'a>,
+        D: IntoDiagnostic<'a>,
     {
         if ident.name != kw::Underscore {
             return;

compiler/rustc_ast_passes/src/errors.rs

@@ -461,15 +461,15 @@ pub struct GenericParamWrongOrder {
     pub correct_order: String,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::obsolete_auto_trait_syntax)]
 #[help]
 pub struct ObsoleteAutoTraitSyntax {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::unsafe_negative_impl, code = "E0198")]
 pub struct UnsafeNegativeImpl {
     #[primary_span]
@@ -480,7 +480,7 @@ pub struct UnsafeNegativeImpl {
     pub unsafe_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::unsafe_inherent_impl, code = "E0197")]
 pub struct UnsafeInherentImpl {
     #[primary_span]
@@ -490,7 +490,7 @@ pub struct UnsafeInherentImpl {
     pub unsafe_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::negative_inherent_impl)]
 pub struct NegativeInherentImpl {
     #[primary_span]
@@ -500,7 +500,7 @@ pub struct NegativeInherentImpl {
     pub negative_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::default_inherent_impl)]
 #[note]
 pub struct DefaultInherentImpl {
@@ -511,7 +511,7 @@ pub struct DefaultInherentImpl {
     pub default_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::const_inherent_impl)]
 #[note]
 pub struct ConstInherentImpl {
@@ -522,50 +522,50 @@ pub struct ConstInherentImpl {
     pub const_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::unsafe_extern_block)]
 pub struct UnsafeExternBlock {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::unsafe_module)]
 pub struct UnsafeModule {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::empty_union)]
 pub struct EmptyUnion {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::ty_alias_with_where_clause)]
 #[note]
 pub struct TyAliasWithWhereClause {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::generic_param_with_default_not_trailing)]
 pub struct GenericParamWithDefaultNotTrailing {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::lifetime_nested_quantification, code = "E0316")]
 pub struct LifetimeNestedQuantification {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::super_trait_with_maybe)]
 #[note]
 pub struct SuperTraitWithMaybe {
@@ -574,14 +574,14 @@ pub struct SuperTraitWithMaybe {
     pub path_str: String,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::trait_object_with_maybe)]
 pub struct TraitObjectWithMaybe {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::forbidden_maybe_const)]
 #[note]
 pub struct ForbiddenMaybeConst {
@@ -610,14 +610,14 @@ impl AddToDiagnostic for DisallowTildeConstContext {
     }
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::maybe_const_with_maybe_trait)]
 pub struct MaybeConstWithMaybeTrait {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::const_async_fn)]
 pub struct ConstAsyncFn {
     #[primary_span]
@@ -630,23 +630,23 @@ pub struct ConstAsyncFn {
     pub fn_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::patterns_in_foreign_fns, code = "E0130")]
 pub struct PatternsInForeignFns {
     #[primary_span]
     #[label]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::patterns_in_fns_without_body, code = "E0642")]
 pub struct PatternsInFnsWithoutBody {
     #[primary_span]
     #[label]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::equality_constraint)]
 #[note]
 pub struct EqualityConstraint {
@@ -662,7 +662,7 @@ pub struct EqualityConstraintToAssocConstraintSuggestion {
     pub suggestion: Vec<(Span, String)>,
 }
 
-impl AddSubdiagnostic for EqualityConstraintToAssocConstraintSuggestion {
+impl AddToDiagnostic for EqualityConstraintToAssocConstraintSuggestion {
     fn add_to_diagnostic(self, diag: &mut Diagnostic) {
         diag.set_arg("assoc_ty", self.assoc_ty);
         diag.multipart_suggestion(