Unrolled build for rust-lang#122503

rust-timer · web-flow · commit 7f203000f56e · 2024-03-14T22:03:03.000-04:00
Rollup merge of rust-lang#122503 - compiler-errors:trait-alias-wf, r=Nilstrieb Make `SubdiagMessageOp` well-formed `WF(Diag<'_, G>)` requires `G: EmissionGuarantee`, but we don't currently check this is true due to limitations in the solver. Probably still worth enforcing. r? `@nnethercote` (or anyone can r+ this, really)
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
@@ -189,7 +189,8 @@ where
     );
 }
 
-pub trait SubdiagMessageOp<G> = Fn(&mut Diag<'_, G>, SubdiagMessage) -> SubdiagMessage;
+pub trait SubdiagMessageOp<G: EmissionGuarantee> =
+    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].

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ where`
`189`	`189`	`);`
`190`	`190`	`}`
`191`	`191`
`192`		`-pub trait SubdiagMessageOp<G> = Fn(&mut Diag<'_, G>, SubdiagMessage) -> SubdiagMessage;`
	`192`	`+pub trait SubdiagMessageOp<G: EmissionGuarantee> =`
	`193`	`+ Fn(&mut Diag<'_, G>, SubdiagMessage) -> SubdiagMessage;`
`193`	`194`
`194`	`195`	`/// Trait implemented by lint types. This should not be implemented manually. Instead, use`
`195`	`196`	/// `#[derive(LintDiagnostic)]` -- see [rustc_macros::LintDiagnostic].