Rename SubdiagnosticMessageOp as SubdiagMessageOp.

Author: nnethercote

compiler/rustc_ast_lowering/src/errors.rs

@@ -1,5 +1,5 @@
 use rustc_errors::{
- codes::*, AddToDiagnostic, Diag, DiagArgFromDisplay, EmissionGuarantee, SubdiagnosticMessageOp,
+ codes::*, AddToDiagnostic, Diag, DiagArgFromDisplay, EmissionGuarantee, SubdiagMessageOp,
 };
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_span::{symbol::Ident, Span, Symbol};
@@ -41,7 +41,7 @@ pub struct InvalidAbi {
 pub struct InvalidAbiReason(pub &'static str);
 
 impl AddToDiagnostic for InvalidAbiReason {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _: F,

compiler/rustc_ast_passes/src/errors.rs

@@ -2,7 +2,7 @@
 
 use rustc_ast::ParamKindOrd;
 use rustc_errors::{
- codes::*, AddToDiagnostic, Applicability, Diag, EmissionGuarantee, SubdiagnosticMessageOp,
+ codes::*, AddToDiagnostic, Applicability, Diag, EmissionGuarantee, SubdiagMessageOp,
 };
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_span::{symbol::Ident, Span, Symbol};
@@ -374,7 +374,7 @@ pub struct EmptyLabelManySpans(pub Vec<Span>);
 
 // The derive for `Vec<Span>` does multiple calls to `span_label`, adding commas between each
 impl AddToDiagnostic for EmptyLabelManySpans {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _: F,
@@ -743,7 +743,7 @@ pub struct StableFeature {
 }
 
 impl AddToDiagnostic for StableFeature {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _: F,

compiler/rustc_builtin_macros/src/errors.rs

@@ -1,6 +1,6 @@
 use rustc_errors::{
  codes::*, AddToDiagnostic, Diag, DiagCtxt, EmissionGuarantee, IntoDiagnostic, Level, MultiSpan,
- SingleLabelManySpans, SubdiagnosticMessageOp,
+ SingleLabelManySpans, SubdiagMessageOp,
 };
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_span::{symbol::Ident, Span, Symbol};
@@ -590,7 +590,7 @@ pub(crate) struct FormatUnusedArg {
 // Allow the singular form to be a subdiagnostic of the multiple-unused
 // form of diagnostic.
 impl AddToDiagnostic for FormatUnusedArg {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,

compiler/rustc_errors/src/diagnostic.rs

@@ -182,14 +182,14 @@ where
 
  /// Add a subdiagnostic to an existing diagnostic where `f` is invoked on every message used
  /// (to optionally perform eager translation).
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,
  );
 }
 
-pub trait SubdiagnosticMessageOp<G> = Fn(&mut Diag<'_, G>, SubdiagMessage) -> SubdiagMessage;
+pub trait SubdiagMessageOp<G> = Fn(&mut Diag<'_, G>, SubdiagMessage) -> SubdiagMessage;
 
 /// Trait implemented by lint types. This should not be implemented manually. Instead, use
 /// `#[derive(LintDiagnostic)]` -- see [rustc_macros::LintDiagnostic].

compiler/rustc_errors/src/diagnostic_impls.rs

@@ -2,7 +2,7 @@ use crate::diagnostic::DiagLocation;
 use crate::{fluent_generated as fluent, AddToDiagnostic};
 use crate::{
  Diag, DiagArgValue, DiagCtxt, EmissionGuarantee, ErrCode, IntoDiagnostic, IntoDiagnosticArg,
- Level, SubdiagnosticMessageOp,
+ Level, SubdiagMessageOp,
 };
 use rustc_ast as ast;
 use rustc_ast_pretty::pprust;
@@ -298,7 +298,7 @@ pub struct SingleLabelManySpans {
  pub label: &'static str,
 }
 impl AddToDiagnostic for SingleLabelManySpans {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _: F,

compiler/rustc_errors/src/lib.rs

@@ -39,7 +39,7 @@ pub use codes::*;
 pub use diagnostic::{
  AddToDiagnostic, BugAbort, DecorateLint, Diag, DiagArg, DiagArgMap, DiagArgName, DiagArgValue,
  DiagInner, DiagStyledString, EmissionGuarantee, FatalAbort, IntoDiagnostic, IntoDiagnosticArg,
- StringPart, Subdiag, SubdiagnosticMessageOp,
+ StringPart, Subdiag, SubdiagMessageOp,
 };
 pub use diagnostic_impls::{
  DiagArgFromDisplay, DiagSymbolList, ExpectedLifetimeParameter, IndicateAnonymousLifetime,

compiler/rustc_hir_typeck/src/errors.rs

@@ -4,7 +4,7 @@ use std::borrow::Cow;
 use crate::fluent_generated as fluent;
 use rustc_errors::{
  codes::*, AddToDiagnostic, Applicability, Diag, DiagArgValue, EmissionGuarantee,
- IntoDiagnosticArg, MultiSpan, SubdiagnosticMessageOp,
+ IntoDiagnosticArg, MultiSpan, SubdiagMessageOp,
 };
 use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
 use rustc_middle::ty::Ty;
@@ -195,7 +195,7 @@ pub struct TypeMismatchFruTypo {
 }
 
 impl AddToDiagnostic for TypeMismatchFruTypo {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -374,7 +374,7 @@ pub struct RemoveSemiForCoerce {
 }
 
 impl AddToDiagnostic for RemoveSemiForCoerce {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -550,7 +550,7 @@ pub enum CastUnknownPointerSub {
 }
 
 impl rustc_errors::AddToDiagnostic for CastUnknownPointerSub {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,

compiler/rustc_infer/src/errors/mod.rs

@@ -1,7 +1,7 @@
 use hir::GenericParamKind;
 use rustc_errors::{
  codes::*, AddToDiagnostic, Applicability, Diag, DiagMessage, DiagStyledString,
- EmissionGuarantee, IntoDiagnosticArg, MultiSpan, SubdiagnosticMessageOp,
+ EmissionGuarantee, IntoDiagnosticArg, MultiSpan, SubdiagMessageOp,
 };
 use rustc_hir as hir;
 use rustc_hir::FnRetTy;
@@ -225,7 +225,7 @@ pub enum RegionOriginNote<'a> {
 }
 
 impl AddToDiagnostic for RegionOriginNote<'_> {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -290,7 +290,7 @@ pub enum LifetimeMismatchLabels {
 }
 
 impl AddToDiagnostic for LifetimeMismatchLabels {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -338,7 +338,7 @@ pub struct AddLifetimeParamsSuggestion<'a> {
 }
 
 impl AddToDiagnostic for AddLifetimeParamsSuggestion<'_> {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -440,7 +440,7 @@ pub struct IntroducesStaticBecauseUnmetLifetimeReq {
 }
 
 impl AddToDiagnostic for IntroducesStaticBecauseUnmetLifetimeReq {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  mut self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -759,7 +759,7 @@ pub struct ConsiderBorrowingParamHelp {
 }
 
 impl AddToDiagnostic for ConsiderBorrowingParamHelp {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,
@@ -804,7 +804,7 @@ pub struct DynTraitConstraintSuggestion {
 }
 
 impl AddToDiagnostic for DynTraitConstraintSuggestion {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,
@@ -851,7 +851,7 @@ pub struct ReqIntroducedLocations {
 }
 
 impl AddToDiagnostic for ReqIntroducedLocations {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  mut self,
  diag: &mut Diag<'_, G>,
  f: F,
@@ -874,7 +874,7 @@ pub struct MoreTargeted {
 }
 
 impl AddToDiagnostic for MoreTargeted {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,
@@ -1297,7 +1297,7 @@ pub struct SuggestTuplePatternMany {
 }
 
 impl AddToDiagnostic for SuggestTuplePatternMany {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,

compiler/rustc_infer/src/errors/note_and_explain.rs

@@ -1,8 +1,6 @@
 use crate::fluent_generated as fluent;
 use crate::infer::error_reporting::nice_region_error::find_anon_type;
-use rustc_errors::{
- AddToDiagnostic, Diag, EmissionGuarantee, IntoDiagnosticArg, SubdiagnosticMessageOp,
-};
+use rustc_errors::{AddToDiagnostic, Diag, EmissionGuarantee, IntoDiagnosticArg, SubdiagMessageOp};
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::{symbol::kw, Span};
 
@@ -162,7 +160,7 @@ impl RegionExplanation<'_> {
 }
 
 impl AddToDiagnostic for RegionExplanation<'_> {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  f: F,

compiler/rustc_lint/src/errors.rs

@@ -1,5 +1,5 @@
 use crate::fluent_generated as fluent;
-use rustc_errors::{codes::*, AddToDiagnostic, Diag, EmissionGuarantee, SubdiagnosticMessageOp};
+use rustc_errors::{codes::*, AddToDiagnostic, Diag, EmissionGuarantee, SubdiagMessageOp};
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_session::lint::Level;
 use rustc_span::{Span, Symbol};
@@ -24,7 +24,7 @@ pub enum OverruledAttributeSub {
 }
 
 impl AddToDiagnostic for OverruledAttributeSub {
- fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
+ fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
  self,
  diag: &mut Diag<'_, G>,
  _f: F,