bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make emit_producing_{guarantee,nothing} consuming.

Browse source 
This is now possible, thanks to changes in previous commits.
This commit is contained in:
Nicholas Nethercote 2024-01-05 17:33:12 +11:00
parent 4752a923af
commit 0cb486bc5b
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_errors/src/diagnostic_builder.rs
View file

@ -95,12 +95,12 @@ pub trait EmissionGuarantee: Sized {
/// `impl` of `EmissionGuarantee`, to make it impossible to create a value /// `impl` of `EmissionGuarantee`, to make it impossible to create a value
/// of `Self::EmitResult` without actually performing the emission. /// of `Self::EmitResult` without actually performing the emission.
#[track_caller] #[track_caller]
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult; fn emit_producing_guarantee(db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult;
} }
impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> { impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> {
/// Most `emit_producing_guarantee` functions use this as a starting point. /// Most `emit_producing_guarantee` functions use this as a starting point.
fn emit_producing_nothing(&mut self) { fn emit_producing_nothing(mut self) {
match self.state { match self.state {
// First `.emit()` call, the `&DiagCtxt` is still available. // First `.emit()` call, the `&DiagCtxt` is still available.
DiagnosticBuilderState::Emittable(dcx) => { DiagnosticBuilderState::Emittable(dcx) => {
@ -115,7 +115,7 @@ impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> {
// FIXME(eddyb) make `ErrorGuaranteed` impossible to create outside `.emit()`. // FIXME(eddyb) make `ErrorGuaranteed` impossible to create outside `.emit()`.
impl EmissionGuarantee for ErrorGuaranteed { impl EmissionGuarantee for ErrorGuaranteed {
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult { fn emit_producing_guarantee(mut db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult {
// Contrast this with `emit_producing_nothing`. // Contrast this with `emit_producing_nothing`.
match db.state { match db.state {
// First `.emit()` call, the `&DiagCtxt` is still available. // First `.emit()` call, the `&DiagCtxt` is still available.
@ -156,7 +156,7 @@ impl EmissionGuarantee for ErrorGuaranteed {
// FIXME(eddyb) should there be a `Option<ErrorGuaranteed>` impl as well? // FIXME(eddyb) should there be a `Option<ErrorGuaranteed>` impl as well?
impl EmissionGuarantee for () { impl EmissionGuarantee for () {
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult { fn emit_producing_guarantee(db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult {
db.emit_producing_nothing(); db.emit_producing_nothing();
} }
} }
@ -169,7 +169,7 @@ pub struct BugAbort;
impl EmissionGuarantee for BugAbort { impl EmissionGuarantee for BugAbort {
type EmitResult = !; type EmitResult = !;
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult { fn emit_producing_guarantee(db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult {
db.emit_producing_nothing(); db.emit_producing_nothing();
panic::panic_any(ExplicitBug); panic::panic_any(ExplicitBug);
} }
@ -183,14 +183,14 @@ pub struct FatalAbort;
impl EmissionGuarantee for FatalAbort { impl EmissionGuarantee for FatalAbort {
type EmitResult = !; type EmitResult = !;
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult { fn emit_producing_guarantee(db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult {
db.emit_producing_nothing(); db.emit_producing_nothing();
crate::FatalError.raise() crate::FatalError.raise()
} }
} }
impl EmissionGuarantee for rustc_span::fatal_error::FatalError { impl EmissionGuarantee for rustc_span::fatal_error::FatalError {
fn emit_producing_guarantee(db: &mut DiagnosticBuilder<'_, Self>) -> Self::EmitResult { fn emit_producing_guarantee(db: DiagnosticBuilder<'_, Self>) -> Self::EmitResult {
db.emit_producing_nothing(); db.emit_producing_nothing();
rustc_span::fatal_error::FatalError rustc_span::fatal_error::FatalError
} }
@ -265,8 +265,8 @@ impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> {
/// Emit and consume the diagnostic. /// Emit and consume the diagnostic.
#[track_caller] #[track_caller]
pub fn emit(mut self) -> G::EmitResult { pub fn emit(self) -> G::EmitResult {
G::emit_producing_guarantee(&mut self) G::emit_producing_guarantee(self)
} }
/// Emit the diagnostic unless `delay` is true, /// Emit the diagnostic unless `delay` is true,